summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--LICENSE.md1
-rw-r--r--Spigot-Server-Patches/0730-Remove-interact-event-from-boat.patch26
2 files changed, 27 insertions, 0 deletions
diff --git a/LICENSE.md b/LICENSE.md
index 3b252c428e..071cd357d4 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -47,4 +47,5 @@ Ivan Pekov <[email protected]>
Bjarne Koll <[email protected]>
MeFisto94 <[email protected]>
+Owen1212055 <[email protected]>
```
diff --git a/Spigot-Server-Patches/0730-Remove-interact-event-from-boat.patch b/Spigot-Server-Patches/0730-Remove-interact-event-from-boat.patch
new file mode 100644
index 0000000000..dc9f9045e6
--- /dev/null
+++ b/Spigot-Server-Patches/0730-Remove-interact-event-from-boat.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+Date: Fri, 23 Apr 2021 16:37:12 -0400
+Subject: [PATCH] Remove interact event from boat
+
+
+diff --git a/src/main/java/net/minecraft/world/item/ItemBoat.java b/src/main/java/net/minecraft/world/item/ItemBoat.java
+index 1d812b3e27f87213afc3e441eb20ca984458ce2a..e24085facbc738c5eecbf85dee1b87072c41537c 100644
+--- a/src/main/java/net/minecraft/world/item/ItemBoat.java
++++ b/src/main/java/net/minecraft/world/item/ItemBoat.java
+@@ -54,6 +54,7 @@ public class ItemBoat extends Item {
+ }
+
+ if (movingobjectpositionblock.getType() == MovingObjectPosition.EnumMovingObjectType.BLOCK) {
++ /* Paper - Remove unneeded interaction event trigger
+ // CraftBukkit start - Boat placement
+ org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, movingobjectpositionblock.getBlockPosition(), movingobjectpositionblock.getDirection(), itemstack, enumhand);
+
+@@ -61,6 +62,7 @@ public class ItemBoat extends Item {
+ return InteractionResultWrapper.pass(itemstack);
+ }
+ // CraftBukkit end
++ */ // Paper - Remove unneeded interaction event trigger
+ EntityBoat entityboat = new EntityBoat(world, movingobjectpositionblock.getPos().x, movingobjectpositionblock.getPos().y, movingobjectpositionblock.getPos().z);
+
+ entityboat.setType(this.b);