Skip to content

Commit

Permalink
Minor adjustment to prevent bow breakage with custom bows that still …
Browse files Browse the repository at this point in the history
…fire events.

Signed-off-by: King Lemming <[email protected]>
  • Loading branch information
KingLemming committed Nov 29, 2017
1 parent 9d9dc83 commit afb6258
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/java/cofh/core/proxy/EventHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class EventHandler {
@SubscribeEvent (priority = EventPriority.HIGHEST)
public void handleArrowLooseEvent(ArrowLooseEvent event) {

if (!(event.getBow().getItem() instanceof ItemBow)) {
if (!(event.getBow().getItem() == Items.BOW)|| !(event.getBow().getItem() instanceof IBowImproved)) {
return;
}
ItemStack stack = event.getBow();
Expand Down Expand Up @@ -134,7 +134,7 @@ public void handleArrowLooseEvent(ArrowLooseEvent event) {
@SubscribeEvent (priority = EventPriority.HIGHEST)
public void handleArrowNockEvent(ArrowNockEvent event) {

if (!(event.getBow().getItem() instanceof ItemBow)) {
if (!(event.getBow().getItem() == Items.BOW)|| !(event.getBow().getItem() instanceof IBowImproved)) {
return;
}
ItemStack stack = event.getBow();
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/cofh/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,13 @@ info.cofh.infiniteSource=Infinite Source
info.cofh.information=Information
info.cofh.item=Item
info.cofh.items=Items
info.cofh.input=Input
info.cofh.level=Level
info.cofh.locked=Locked
info.cofh.low=Low
info.cofh.modeChange=to Change Mode
info.cofh.none=None
info.cofh.output=Output
info.cofh.owner=Owner
info.cofh.perUse=Per Use
info.cofh.potency=Potency
Expand Down

0 comments on commit afb6258

Please sign in to comment.