stop sending break_bedrock stat to prevent disconneting player

TISUnion · Apr 15, 2020 · 78cb367 · 78cb367
1 parent c9c61ea
commit 78cb367
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/patches/net/minecraft/block/BlockPistonBase.java.patch b/patches/net/minecraft/block/BlockPistonBase.java.patch
@@ -38,7 +38,7 @@
          }
      }
 
-+    // TISCM break_bedrock stats
++    // TISCM break_bedrock stat
 +    private void tryAddNearestPlayerStats(World worldIn, BlockPos pos)
 +    {
 +        if (worldIn.getBlockState(pos).getBlock() == Blocks.BEDROCK)
@@ -54,7 +54,7 @@
                  {
                      if (id != 1 || iblockstate.isAir() || !canPush(iblockstate, worldIn, blockpos, enumfacing.getOpposite(), false, enumfacing) || iblockstate.getPushReaction() != EnumPushReaction.NORMAL && block != Blocks.PISTON && block != Blocks.STICKY_PISTON)
                      {
-+                        // TISCM break_bedrock stats
++                        // TISCM break_bedrock stat
 +                        tryAddNearestPlayerStats(worldIn, pos.offset(enumfacing));
 +
                          worldIn.removeBlock(pos.offset(enumfacing));
@@ -64,7 +64,7 @@
              }
              else
              {
-+                // TISCM break_bedrock stats
++                // TISCM break_bedrock stat
 +                tryAddNearestPlayerStats(worldIn, pos.offset(enumfacing));
 +
                  worldIn.removeBlock(pos.offset(enumfacing));

diff --git a/patches/net/minecraft/server/management/PlayerList.java.patch b/patches/net/minecraft/server/management/PlayerList.java.patch
@@ -69,7 +69,7 @@
          }
      }
 
-+    // TISCM break_bedrock stats
++    // TISCM break_bedrock stat
 +    public void addStatsToNearestPlayersInDimensionNear(DimensionType dimension, BlockPos pos, double radius, ResourceLocation stat, int amount)
 +    {
 +        Comparator<Pair<Double, EntityPlayerMP>> comparator = (a, b) ->

diff --git a/patches/net/minecraft/stats/StatList.java.patch b/patches/net/minecraft/stats/StatList.java.patch
@@ -4,7 +4,7 @@
      public static final ResourceLocation SLEEP_IN_BED = registerCustom("sleep_in_bed", IStatFormater.DEFAULT);
      public static final ResourceLocation OPEN_SHULKER_BOX = registerCustom("open_shulker_box", IStatFormater.DEFAULT);
 
-+    // TISCM break_bedrock stats
++    // TISCM break_bedrock stat
 +    public static final ResourceLocation BREAK_BEDROCK = registerCustom("break_bedrock", IStatFormater.DEFAULT);
 +
      public static void boot()

diff --git a/patches/net/minecraft/stats/StatisticsManagerServer.java.patch b/patches/net/minecraft/stats/StatisticsManagerServer.java.patch
@@ -0,0 +1,16 @@
+--- a/net/minecraft/stats/StatisticsManagerServer.java
++++ b/net/minecraft/stats/StatisticsManagerServer.java
+@@ -247,7 +247,12 @@
+
+             for (Stat<?> stat : this.getDirty())
+             {
+-                object2intmap.put(stat, this.getValue(stat));
++                // TISCM break_bedrock stat
++                // yeet before send or disconnect u
++                if (!stat.getName().equals("minecraft.custom:minecraft.break_bedrock"))
++                {
++                    object2intmap.put(stat, this.getValue(stat));
++                }
+             }
+         }
+