35 lines
1.7 KiB
Diff
35 lines
1.7 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 7e07fd0c8dec9f9cdeda65dfa0ccf42b4dde010e..9d1116f601b79dabf7a0d9e5ecf5c2a0306f9aa4 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -78,6 +78,7 @@ import net.minecraft.util.Mth;
|
||
|
|
import net.minecraft.world.effect.MobEffectInstance;
|
||
|
|
import net.minecraft.world.entity.Entity;
|
||
|
|
import net.minecraft.world.entity.EntityType;
|
||
|
|
+import net.minecraft.world.entity.npc.AbstractVillager;
|
||
|
|
import net.minecraft.world.level.ChunkPos;
|
||
|
|
import net.minecraft.world.level.GameRules;
|
||
|
|
import net.minecraft.world.level.GameType;
|
||
|
|
@@ -617,6 +618,15 @@ public abstract class PlayerList {
|
||
|
|
|
||
|
|
for (Iterator iterator = entity.getIndirectPassengers().iterator(); iterator.hasNext(); entity1.removed = true) {
|
||
|
|
entity1 = (Entity) iterator.next();
|
||
|
|
+ // Paper start
|
||
|
|
+ if (entity1 instanceof AbstractVillager) {
|
||
|
|
+ final AbstractVillager villager = (AbstractVillager) entity1;
|
||
|
|
+ final net.minecraft.world.entity.player.Player human = villager.getTradingPlayer();
|
||
|
|
+ if (human != null) {
|
||
|
|
+ villager.setTradingPlayer(null);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
worldserver.despawn(entity1);
|
||
|
|
}
|
||
|
|
|