2021-06-14 19:58:32 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-06-17 09:37:24 +00:00
|
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
2021-06-14 19:58:32 +00:00
|
|
|
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
|
2021-06-17 19:12:40 +00:00
|
|
|
index 6b4bd115c39bbaa9d9dbeb6ac590e6b0138aa5b3..7ed8baf2942744c4f9cd1bf05aded6c9bc90f542 100644
|
2021-06-14 19:58:32 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2021-06-17 08:37:27 +00:00
|
|
|
@@ -613,6 +613,15 @@ public abstract class PlayerList {
|
2021-06-14 19:58:32 +00:00
|
|
|
PlayerList.LOGGER.debug("Removing player mount");
|
|
|
|
|
entityplayer.stopRiding();
|
|
|
|
|
entity.getPassengersAndSelf().forEach((entity1) -> {
|
|
|
|
|
+ // Paper start
|
|
|
|
|
+ if (entity1 instanceof net.minecraft.world.entity.npc.AbstractVillager) {
|
|
|
|
|
+ final net.minecraft.world.entity.npc.AbstractVillager villager = (net.minecraft.world.entity.npc.AbstractVillager) entity1;
|
|
|
|
|
+ final net.minecraft.world.entity.player.Player human = villager.getTradingPlayer();
|
|
|
|
|
+ if (human != null) {
|
|
|
|
|
+ villager.setTradingPlayer(null);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ // Paper end
|
|
|
|
|
entity1.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER);
|
|
|
|
|
});
|
|
|
|
|
}
|
