From 272426acd7cfb50978f478f49d835c8541da2a4e Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 2 Aug 2018 09:38:52 +1000 Subject: SPIGOT-4199: Riptide related APIs --- nms-patches/ItemTrident.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 nms-patches/ItemTrident.patch (limited to 'nms-patches/ItemTrident.patch') diff --git a/nms-patches/ItemTrident.patch b/nms-patches/ItemTrident.patch new file mode 100644 index 00000000..7de03dd6 --- /dev/null +++ b/nms-patches/ItemTrident.patch @@ -0,0 +1,27 @@ +--- a/net/minecraft/server/ItemTrident.java ++++ b/net/minecraft/server/ItemTrident.java +@@ -6,9 +6,13 @@ + + public ItemTrident(Item.Info item_info) { + super(item_info); ++ // CraftBukkit start - obfuscator went a little crazy ++ /* + this.a(new MinecraftKey("throwing"), (itemstack, world, entityliving) -> { + return entityliving != null && entityliving.isHandRaised() && entityliving.cW() == itemstack ? 1.0F : 0.0F; + }); ++ */ ++ // CraftBukkit end + } + + public boolean a(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) { +@@ -53,6 +57,10 @@ + SoundEffect soundeffect = SoundEffects.ITEM_TRIDENT_THROW; + + if (k > 0) { ++ // CraftBukkit start ++ org.bukkit.event.player.PlayerRiptideEvent event = new org.bukkit.event.player.PlayerRiptideEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack)); ++ event.getPlayer().getServer().getPluginManager().callEvent(event); ++ // CraftBukkit end + float f = entityhuman.yaw; + float f1 = entityhuman.pitch; + float f2 = -MathHelper.sin(f * 0.017453292F) * MathHelper.cos(f1 * 0.017453292F); -- cgit v1.2.3