mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-19 18:31:18 +02:00
27 lines
1.3 KiB
Diff
27 lines
1.3 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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
index d2a7fa1595ed4bc9fea0238af42f70889e07b262..46e1723f4042d3fef5bc73552d496968a532342c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
@@ -542,6 +542,15 @@ public abstract class PlayerList {
|
||
|
|
|
||
|
|
for (Iterator iterator = entity.getAllPassengers().iterator(); iterator.hasNext(); entity1.dead = true) {
|
||
|
|
entity1 = (Entity) iterator.next();
|
||
|
|
+ // Paper start
|
||
|
|
+ if (entity1 instanceof EntityVillagerAbstract) {
|
||
|
|
+ final EntityVillagerAbstract villager = (EntityVillagerAbstract) entity1;
|
||
|
|
+ final EntityHuman human = villager.getTrader();
|
||
|
|
+ if (human != null) {
|
||
|
|
+ villager.setTradingPlayer(null);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
worldserver.removeEntity(entity1);
|
||
|
|
}
|
||
|
|
|