From 026b6d651934d6a65403ca7da8a009aed1bdc9b8 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Tue, 13 Jul 2021 18:19:44 -0700
Subject: [PATCH] Regen patches.

---
 .../net/minecraft/block/StemBlock.java.patch    |  4 ++--
 .../server/management/PlayerList.java.patch     | 17 +++++++++++++++--
 .../world/server/ServerWorld.java.patch         |  6 +++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/patches/minecraft/net/minecraft/block/StemBlock.java.patch b/patches/minecraft/net/minecraft/block/StemBlock.java.patch
index dd697331f4..2d579a3f9d 100644
--- a/patches/minecraft/net/minecraft/block/StemBlock.java.patch
+++ b/patches/minecraft/net/minecraft/block/StemBlock.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/block/StemBlock.java
 +++ b/net/minecraft/block/StemBlock.java
-@@ -40,22 +40,24 @@
+@@ -38,22 +38,24 @@
  
     public void func_225534_a_(BlockState p_225534_1_, ServerWorld p_225534_2_, BlockPos p_225534_3_, Random p_225534_4_) {
        super.func_225534_a_(p_225534_1_, p_225534_2_, p_225534_3_, p_225534_4_);
@@ -30,7 +30,7 @@
           }
  
        }
-@@ -101,4 +103,10 @@
+@@ -98,4 +100,10 @@
     public StemGrownBlock func_208486_d() {
        return this.field_149877_a;
     }
diff --git a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch
index 993a5fb4f6..627bd03f38 100644
--- a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch
+++ b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch
@@ -157,7 +157,20 @@
        return serverplayerentity;
     }
  
-@@ -739,7 +767,7 @@
+@@ -698,12 +726,6 @@
+       if (serverstatisticsmanager == null) {
+          File file1 = new File(this.field_72400_f.func_71218_a(DimensionType.field_223227_a_).func_217485_w().func_75765_b(), "stats");
+          File file2 = new File(file1, uuid + ".json");
+-         if (!file2.exists()) {
+-            File file3 = new File(file1, p_152602_1_.func_200200_C_().getString() + ".json");
+-            if (file3.exists() && file3.isFile()) {
+-               file3.renameTo(file2);
+-            }
+-         }
+ 
+          serverstatisticsmanager = new ServerStatisticsManager(this.field_72400_f, file2);
+          this.field_148547_k.put(uuid, serverstatisticsmanager);
+@@ -739,7 +761,7 @@
     }
  
     public List<ServerPlayerEntity> func_181057_v() {
@@ -166,7 +179,7 @@
     }
  
     @Nullable
-@@ -769,4 +797,12 @@
+@@ -769,4 +791,12 @@
     public boolean func_206257_x() {
        return this.field_72407_n;
     }
diff --git a/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch b/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch
index 9d4de253e9..19fcb06337 100644
--- a/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch
+++ b/patches/minecraft/net/minecraft/world/server/ServerWorld.java.patch
@@ -264,7 +264,7 @@
        }
     }
  
-@@ -985,8 +1015,11 @@
+@@ -985,12 +1015,16 @@
     }
  
     public void func_217434_e(ServerPlayerEntity p_217434_1_) {
@@ -304,7 +304,7 @@
        this.field_73061_a.func_184103_al().func_148543_a(p_217384_1_, p_217384_2_.func_226277_ct_(), p_217384_2_.func_226278_cu_(), p_217384_2_.func_226281_cx_(), p_217384_5_ > 1.0F ? (double)(16.0F * p_217384_5_) : 16.0D, this.field_73011_w.func_186058_p(), new SSpawnMovingSoundEffectPacket(p_217384_3_, p_217384_4_, p_217384_2_, p_217384_5_, p_217384_6_));
     }
  
-@@ -1049,6 +1092,7 @@
+@@ -1049,6 +1093,7 @@
  
     public Explosion func_217401_a(@Nullable Entity p_217401_1_, @Nullable DamageSource p_217401_2_, double p_217401_3_, double p_217401_5_, double p_217401_7_, float p_217401_9_, boolean p_217401_10_, Explosion.Mode p_217401_11_) {
        Explosion explosion = new Explosion(this, p_217401_1_, p_217401_3_, p_217401_5_, p_217401_7_, p_217401_9_, p_217401_10_, p_217401_11_);
@@ -312,7 +312,7 @@
        if (p_217401_2_ != null) {
           explosion.func_199592_a(p_217401_2_);
        }
-@@ -1377,4 +1421,15 @@
+@@ -1377,4 +1422,15 @@
           return p_229854_1_.func_175898_b(p_229855_1_.func_180328_a());
        });
     }