hotfix

ZimnyCat · Dec 26, 2020 · 1f8a546 · 1f8a546
1 parent 24a1083
commit 1f8a546
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 84 deletions.
diff --git a/src/main/java/bleach/hack/mixin/MixinBookUpdateC2SPacket.java b/src/main/java/bleach/hack/mixin/MixinBookUpdateC2SPacket.java
diff --git a/src/main/java/bleach/hack/module/ModuleManager.java b/src/main/java/bleach/hack/module/ModuleManager.java
@@ -56,7 +56,6 @@ public class ModuleManager {
         new BlockHighlight(),
         new BlockParty(),
         new BookCrash(),
-        new BookInvRollback(),
         new BowBot(),
         new BoxESP(),
         new ChestESP(),

diff --git a/src/main/java/bleach/hack/module/mods/BookInvRollback.java b/src/main/java/bleach/hack/module/mods/BookInvRollback.java
diff --git a/src/main/java/bleach/hack/module/mods/KillStreak.java b/src/main/java/bleach/hack/module/mods/KillStreak.java
@@ -24,7 +24,7 @@ public KillStreak() {
 
     @Subscribe
     public void onTick(EventTick eventTick) {
-        if (mc.getServer() == null && kills != 0) kills = 0;
+        if (mc.player == null) kills = 0;
         if (mc.player.isDead() && kills != 0) kills = 0;
     }
 

diff --git a/src/main/java/bleach/hack/module/mods/TotemNotifier.java b/src/main/java/bleach/hack/module/mods/TotemNotifier.java
@@ -20,7 +20,7 @@ public class TotemNotifier extends Module {
 
     @Subscribe
     public void onTick(EventTick event) {
-        if (mc.getServer() == null && !players.isEmpty()) players.clear();
+        if (mc.player == null) players.clear();
         for (Entity entity : mc.world.getEntities()) {
             if (!(entity instanceof PlayerEntity) || entity == mc.player) continue;
             String displayName = entity.getDisplayName().getString();
@@ -29,7 +29,7 @@ public void onTick(EventTick event) {
             boolean totem = false;
             if (mainHandItem == Items.TOTEM_OF_UNDYING || offHandItem == Items.TOTEM_OF_UNDYING) totem = true;
             if (!players.containsKey(displayName)) {
-                players.put(displayName, totem);
+                players.putIfAbsent(displayName, totem);
                 BleachLogger.infoMessage(totem ? "\u00a7f" + displayName + " \u00a73has totem in his hand" :
                         "\u00a7f" + displayName + " \u00a73hasn't totem in his hand");
             }

diff --git a/src/main/java/bleach/hack/module/mods/UI.java b/src/main/java/bleach/hack/module/mods/UI.java
@@ -92,7 +92,10 @@ public void onDrawOverlay(EventDrawOverlay event) {
                 arrayCount++;
             }
         }
-        if (getSetting(14).asToggle().state) infoList.add("\u00a7fServerBrand [" + mc.player.getServerBrand() + "]");
+        if (getSetting(14).asToggle().state) {
+            String serverBrand = mc.player.getServerBrand() == null ? "null" : mc.player.getServerBrand();
+            infoList.add("\u00a7fServerBrand [\u00a7a" + serverBrand + "\u00a7f]");
+        }
 
         if (getSetting(8).asToggle().state && !mc.options.debugEnabled) {
             infoList.add("\u00a7fPlayers [\u00a7a" + mc.player.networkHandler.getPlayerList().size() + "\u00a7f]");

diff --git a/src/main/resources/bleachhack.mixins.json b/src/main/resources/bleachhack.mixins.json
@@ -12,7 +12,6 @@
     "IKeyBinding",
     "IMinecraftClient",
     "MixinBlockModelRenderer",
-    "MixinBookUpdateC2SPacket",
     "MixinBossBarHud",
     "MixinCamera",
     "MixinChunkOcclusionGraphBuilder",