From 2c6b1f048dd03e31678293dacf243124dacb1fea Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 19 May 2021 13:38:40 +0100 Subject: [PATCH] Revert "Remove itneract event from boat" (Fixes #5677) --- ...atch => 0730-Add-basic-Datapack-API.patch} | 0 ...0730-Remove-interact-event-from-boat.patch | 26 ------------------- ...ment-variable-to-disable-server-gui.patch} | 0 ...itions-to-PlayerGameModeChangeEvent.patch} | 0 ... => 0733-ItemStack-repair-check-API.patch} | 0 ....patch => 0734-More-Enchantment-API.patch} | 0 ...option-to-load-extra-plugin-jars-no.patch} | 0 7 files changed, 26 deletions(-) rename Spigot-Server-Patches/{0731-Add-basic-Datapack-API.patch => 0730-Add-basic-Datapack-API.patch} (100%) delete mode 100644 Spigot-Server-Patches/0730-Remove-interact-event-from-boat.patch rename Spigot-Server-Patches/{0732-Add-environment-variable-to-disable-server-gui.patch => 0731-Add-environment-variable-to-disable-server-gui.patch} (100%) rename Spigot-Server-Patches/{0733-additions-to-PlayerGameModeChangeEvent.patch => 0732-additions-to-PlayerGameModeChangeEvent.patch} (100%) rename Spigot-Server-Patches/{0734-ItemStack-repair-check-API.patch => 0733-ItemStack-repair-check-API.patch} (100%) rename Spigot-Server-Patches/{0735-More-Enchantment-API.patch => 0734-More-Enchantment-API.patch} (100%) rename Spigot-Server-Patches/{0736-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0735-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%) diff --git a/Spigot-Server-Patches/0731-Add-basic-Datapack-API.patch b/Spigot-Server-Patches/0730-Add-basic-Datapack-API.patch similarity index 100% rename from Spigot-Server-Patches/0731-Add-basic-Datapack-API.patch rename to Spigot-Server-Patches/0730-Add-basic-Datapack-API.patch diff --git a/Spigot-Server-Patches/0730-Remove-interact-event-from-boat.patch b/Spigot-Server-Patches/0730-Remove-interact-event-from-boat.patch deleted file mode 100644 index dc9f9045e6..0000000000 --- a/Spigot-Server-Patches/0730-Remove-interact-event-from-boat.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> -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); diff --git a/Spigot-Server-Patches/0732-Add-environment-variable-to-disable-server-gui.patch b/Spigot-Server-Patches/0731-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from Spigot-Server-Patches/0732-Add-environment-variable-to-disable-server-gui.patch rename to Spigot-Server-Patches/0731-Add-environment-variable-to-disable-server-gui.patch diff --git a/Spigot-Server-Patches/0733-additions-to-PlayerGameModeChangeEvent.patch b/Spigot-Server-Patches/0732-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0733-additions-to-PlayerGameModeChangeEvent.patch rename to Spigot-Server-Patches/0732-additions-to-PlayerGameModeChangeEvent.patch diff --git a/Spigot-Server-Patches/0734-ItemStack-repair-check-API.patch b/Spigot-Server-Patches/0733-ItemStack-repair-check-API.patch similarity index 100% rename from Spigot-Server-Patches/0734-ItemStack-repair-check-API.patch rename to Spigot-Server-Patches/0733-ItemStack-repair-check-API.patch diff --git a/Spigot-Server-Patches/0735-More-Enchantment-API.patch b/Spigot-Server-Patches/0734-More-Enchantment-API.patch similarity index 100% rename from Spigot-Server-Patches/0735-More-Enchantment-API.patch rename to Spigot-Server-Patches/0734-More-Enchantment-API.patch diff --git a/Spigot-Server-Patches/0736-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/Spigot-Server-Patches/0735-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from Spigot-Server-Patches/0736-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to Spigot-Server-Patches/0735-Add-command-line-option-to-load-extra-plugin-jars-no.patch