diff options
| author | md_5 <git@md-5.net> | 2018-08-16 20:23:17 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-08-16 20:23:17 +1000 |
| commit | 1728eb298e598d17729ac16638b207218681147f (patch) | |
| tree | f3413f5b8f2dae478471a3b3206dbf05ae1ee557 | |
| parent | 7c341e9beb46de47af7c9fae5857abdbe6f7a549 (diff) | |
| download | craftbukkit-1728eb298e598d17729ac16638b207218681147f.tar craftbukkit-1728eb298e598d17729ac16638b207218681147f.tar.gz craftbukkit-1728eb298e598d17729ac16638b207218681147f.tar.lz craftbukkit-1728eb298e598d17729ac16638b207218681147f.tar.xz craftbukkit-1728eb298e598d17729ac16638b207218681147f.zip | |
SPIGOT-4279: Move turtle egg interact event
| -rw-r--r-- | nms-patches/BlockTurtleEgg.patch | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/nms-patches/BlockTurtleEgg.patch b/nms-patches/BlockTurtleEgg.patch index 4c40badf..0e41a792 100644 --- a/nms-patches/BlockTurtleEgg.patch +++ b/nms-patches/BlockTurtleEgg.patch @@ -1,38 +1,38 @@ --- a/net/minecraft/server/BlockTurtleEgg.java +++ b/net/minecraft/server/BlockTurtleEgg.java -@@ -3,6 +3,11 @@ +@@ -2,6 +2,12 @@ + import java.util.Random; import javax.annotation.Nullable; - ++import org.bukkit.craftbukkit.block.CraftBlock; ++ +// CraftBukkit start +import org.bukkit.event.entity.EntityInteractEvent; +import org.bukkit.craftbukkit.event.CraftEventFactory; +// CraftBukkit end -+ + public class BlockTurtleEgg extends Block { - private static final VoxelShape c = Block.a(3.0D, 0.0D, 3.0D, 12.0D, 7.0D, 12.0D); -@@ -34,6 +39,20 @@ - if (entity instanceof EntityTurtle) { +@@ -35,6 +41,19 @@ super.stepOn(world, blockposition, entity); } else { -+ // CraftBukkit start - Step on eggs -+ org.bukkit.event.Cancellable cancellable; -+ if (entity instanceof EntityHuman) { -+ cancellable = CraftEventFactory.callPlayerInteractEvent((EntityHuman) entity, org.bukkit.event.block.Action.PHYSICAL, blockposition, null, null, null); -+ } else { -+ cancellable = new EntityInteractEvent(entity.getBukkitEntity(), world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ())); -+ world.getServer().getPluginManager().callEvent((EntityInteractEvent) cancellable); -+ } -+ -+ if (cancellable.isCancelled()) { -+ return; -+ } -+ // CraftBukkit end -+ if (!world.isClientSide && world.random.nextInt(i) == 0) { ++ // CraftBukkit start - Step on eggs ++ org.bukkit.event.Cancellable cancellable; ++ if (entity instanceof EntityHuman) { ++ cancellable = CraftEventFactory.callPlayerInteractEvent((EntityHuman) entity, org.bukkit.event.block.Action.PHYSICAL, blockposition, null, null, null); ++ } else { ++ cancellable = new EntityInteractEvent(entity.getBukkitEntity(), CraftBlock.at(world, blockposition)); ++ world.getServer().getPluginManager().callEvent((EntityInteractEvent) cancellable); ++ } ++ ++ if (cancellable.isCancelled()) { ++ return; ++ } ++ // CraftBukkit end this.a(world, blockposition, iblockdata); } + @@ -72,7 +91,7 @@ entityturtle.setAgeRaw(-24000); entityturtle.g(blockposition); |