From 88d02712dbee8d53e1b4fb07b4ba77c4778d9eb7 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Mon, 29 Jun 2020 13:56:47 -0700
Subject: [PATCH] Fix missed patch in PlayerList and EntitySelectioonContext.
 Closes #6846 Closes #6850

---
 .../minecraft/server/management/PlayerList.java.patch | 11 +++++++++++
 .../math/shapes/EntitySelectionContext.java.patch     |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch
index dd83574d0..b18d812c9 100644
--- a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch
+++ b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch
@@ -66,6 +66,17 @@
        this.field_72400_f.func_201300_aS().func_201382_b(p_72367_1_);
        UUID uuid = p_72367_1_.func_110124_au();
        ServerPlayerEntity serverplayerentity = this.field_177454_f.get(uuid);
+@@ -397,8 +403,8 @@
+    }
+ 
+    public ServerPlayerEntity func_232644_a_(ServerPlayerEntity p_232644_1_, boolean p_232644_2_) {
+-      this.field_72404_b.remove(p_232644_1_);
+-      p_232644_1_.func_71121_q().func_217434_e(p_232644_1_);
++      this.removePlayer(p_232644_1_);
++      p_232644_1_.func_71121_q().removePlayer(p_232644_1_, true); // Forge: keep data until copyFrom called
+       BlockPos blockpos = p_232644_1_.func_241140_K_();
+       boolean flag = p_232644_1_.func_241142_M_();
+       ServerWorld serverworld = this.field_72400_f.func_71218_a(p_232644_1_.func_241141_L_());
 @@ -420,6 +426,7 @@
        ServerPlayerEntity serverplayerentity = new ServerPlayerEntity(this.field_72400_f, serverworld1, p_232644_1_.func_146103_bH(), playerinteractionmanager);
        serverplayerentity.field_71135_a = p_232644_1_.field_71135_a;
diff --git a/patches/minecraft/net/minecraft/util/math/shapes/EntitySelectionContext.java.patch b/patches/minecraft/net/minecraft/util/math/shapes/EntitySelectionContext.java.patch
index 7c8c502f1..f20b394db 100644
--- a/patches/minecraft/net/minecraft/util/math/shapes/EntitySelectionContext.java.patch
+++ b/patches/minecraft/net/minecraft/util/math/shapes/EntitySelectionContext.java.patch
@@ -12,6 +12,15 @@
        this.field_227579_b_ = p_i232177_1_;
        this.field_216381_c = p_i232177_2_;
        this.field_216382_d = p_i232177_4_;
+@@ -33,7 +38,7 @@
+ 
+    @Deprecated
+    protected EntitySelectionContext(Entity p_i51182_1_) {
+-      this(p_i51182_1_.func_226274_bn_(), p_i51182_1_.func_226278_cu_(), p_i51182_1_ instanceof LivingEntity ? ((LivingEntity)p_i51182_1_).func_184614_ca().func_77973_b() : Items.field_190931_a, p_i51182_1_ instanceof LivingEntity ? ((LivingEntity)p_i51182_1_)::func_230285_a_ : (p_237494_0_) -> {
++      this(p_i51182_1_, p_i51182_1_.func_226274_bn_(), p_i51182_1_.func_226278_cu_(), p_i51182_1_ instanceof LivingEntity ? ((LivingEntity)p_i51182_1_).func_184614_ca().func_77973_b() : Items.field_190931_a, p_i51182_1_ instanceof LivingEntity ? ((LivingEntity)p_i51182_1_)::func_230285_a_ : (p_237494_0_) -> {
+          return false;
+       });
+    }
 @@ -53,4 +58,11 @@
     public boolean func_216378_a(VoxelShape p_216378_1_, BlockPos p_216378_2_, boolean p_216378_3_) {
        return this.field_216381_c > (double)p_216378_2_.func_177956_o() + p_216378_1_.func_197758_c(Direction.Axis.Y) - (double)1.0E-5F;