27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: jmp <jasonpenilla2@me.com>
|
||
|
|
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 ce6d9b460f0f55fc6d5544d5c8d2b78e5fcc3937..9a37a962b141e9faecc9f6f4906a9d727d20c20a 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -613,6 +613,15 @@ public abstract class PlayerList {
|
||
|
|
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);
|
||
|
|
});
|
||
|
|
}
|