keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fixed NeighborNotifyEvent not containing the piston facing direction.

Browse source 
(cherry picked from commit 5637c41)
This commit is contained in:
Me4502 2016-07-06 23:07:13 -04:00 committed by cpw
parent a3d8664028
commit 579f028294
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/minecraft/net/minecraft/tileentity/TileEntityPiston.java.patch
View file

@ -5,7 +5,7 @@
{ {
this.field_145850_b.func_180501_a(this.field_174879_c, this.field_174932_a, 3); this.field_145850_b.func_180501_a(this.field_174879_c, this.field_174932_a, 3);
- this.field_145850_b.func_180496_d(this.field_174879_c, this.field_174932_a.func_177230_c()); - this.field_145850_b.func_180496_d(this.field_174879_c, this.field_174932_a.func_177230_c());
+ if(!net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(field_145850_b, field_174879_c, field_145850_b.func_180495_p(field_174879_c), java.util.EnumSet.noneOf(EnumFacing.class)).isCanceled()) + if(!net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(field_145850_b, field_174879_c, field_145850_b.func_180495_p(field_174879_c), java.util.EnumSet.of(this.field_174931_f.func_176734_d())).isCanceled())
+ this.field_145850_b.func_180496_d(this.field_174879_c, this.field_174932_a.func_177230_c()); + this.field_145850_b.func_180496_d(this.field_174879_c, this.field_174932_a.func_177230_c());
} }
} }
@ -15,7 +15,7 @@
{ {
this.field_145850_b.func_180501_a(this.field_174879_c, this.field_174932_a, 3); this.field_145850_b.func_180501_a(this.field_174879_c, this.field_174932_a, 3);
- this.field_145850_b.func_180496_d(this.field_174879_c, this.field_174932_a.func_177230_c()); - this.field_145850_b.func_180496_d(this.field_174879_c, this.field_174932_a.func_177230_c());
+ if(!net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(field_145850_b, field_174879_c, field_145850_b.func_180495_p(field_174879_c), java.util.EnumSet.noneOf(EnumFacing.class)).isCanceled()) + if(!net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(field_145850_b, field_174879_c, field_145850_b.func_180495_p(field_174879_c), java.util.EnumSet.of(this.field_174931_f.func_176734_d())).isCanceled())
+ this.field_145850_b.func_180496_d(this.field_174879_c, this.field_174932_a.func_177230_c()); + this.field_145850_b.func_180496_d(this.field_174879_c, this.field_174932_a.func_177230_c());
} }
} }

2
src/test/java/net/minecraftforge/test/NeighborNotifyEventTest.java
View file

@ -23,7 +23,7 @@ public class NeighborNotifyEventTest
public void onNeighborNotify(NeighborNotifyEvent event) public void onNeighborNotify(NeighborNotifyEvent event)
{ {
if(ENABLE) { if(ENABLE) {
System.out.println(event.getPos().toString()); System.out.println(event.getPos().toString() + " with face information: " + event.getNotifiedSides());
event.setCanceled(true); event.setCanceled(true);
} }
} }