Paper/patches/server/0547-Fix-villager-boat-exploit.patch

26 lines
1.3 KiB
Diff
Raw Normal View History

2021-06-14 21:58:32 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2021-06-17 11:37:24 +02:00
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-06-14 21:58:32 +02: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
index 4e28eca701b91d1533b5eeffc96b66c4e71da1db..310f14b440697c8a32660592acf05b50be43c445 100644
2021-06-14 21:58:32 +02:00
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -577,6 +577,14 @@ public abstract class PlayerList {
2021-06-14 21:58:32 +02:00
PlayerList.LOGGER.debug("Removing player mount");
entityplayer.stopRiding();
entity.getPassengersAndSelf().forEach((entity1) -> {
+ // Paper start
2021-11-24 19:27:25 +01:00
+ if (entity1 instanceof net.minecraft.world.entity.npc.AbstractVillager villager) {
2021-06-14 21:58:32 +02:00
+ 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);
});
}