aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0469-Fix-villager-boat-exploit.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0469-Fix-villager-boat-exploit.patch')
-rw-r--r--patches/server/0469-Fix-villager-boat-exploit.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/server/0469-Fix-villager-boat-exploit.patch b/patches/server/0469-Fix-villager-boat-exploit.patch
new file mode 100644
index 0000000000..5856a8c32b
--- /dev/null
+++ b/patches/server/0469-Fix-villager-boat-exploit.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <[email protected]>
+Date: Mon, 11 Jan 2021 12:43:51 -0800
+Subject: [PATCH] Fix villager boat exploit
+
+
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index 98eb00a8ee23543714d424d3ff5ca19887d6db19..9436a9614dea81d14c4f77cc21ca91f85ca87152 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -595,6 +595,14 @@ public abstract class PlayerList {
+ PlayerList.LOGGER.debug("Removing player mount");
+ entityplayer.stopRiding();
+ entity.getPassengersAndSelf().forEach((entity1) -> {
++ // Paper start - Fix villager boat exploit
++ if (entity1 instanceof net.minecraft.world.entity.npc.AbstractVillager villager) {
++ final net.minecraft.world.entity.player.Player human = villager.getTradingPlayer();
++ if (human != null) {
++ villager.setTradingPlayer(null);
++ }
++ }
++ // Paper end - Fix villager boat exploit
+ entity1.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER, EntityRemoveEvent.Cause.PLAYER_QUIT); // CraftBukkit - add Bukkit remove cause
+ });
+ }