From dcceb091864cb6862298d8bea533c7dea9d7ecf4 Mon Sep 17 00:00:00 2001 From: Stachelbeere1248 Date: Sat, 18 Nov 2023 20:45:19 +0100 Subject: [PATCH] fixed unneccesary error --- gradle.properties | 2 +- .../mixin/MixinNetHandlerPlayClient.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 38a7006..63101bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx2g baseGroup = com.github.stachelbeere1248.zombiesutils mcVersion = 1.8.9 modid = zombiesutils -version = 1.1.3 \ No newline at end of file +version = 1.1.4 \ No newline at end of file diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/mixin/MixinNetHandlerPlayClient.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/mixin/MixinNetHandlerPlayClient.java index 4cb7141..8f2c183 100644 --- a/src/main/java/com/github/stachelbeere1248/zombiesutils/mixin/MixinNetHandlerPlayClient.java +++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/mixin/MixinNetHandlerPlayClient.java @@ -29,7 +29,7 @@ public class MixinNetHandlerPlayClient { @Unique private void zombies_utils$handleSound(@NotNull S29PacketSoundEffect packet) { if (Scoreboard.isZombies()) return; - String soundEffect = packet.getSoundName(); + final String soundEffect = packet.getSoundName(); if (!( soundEffect.equals("mob.wither.spawn") || (soundEffect.equals("mob.guardian.curse") && !zombies_utils$alienUfoOpened) @@ -37,24 +37,24 @@ public class MixinNetHandlerPlayClient { zombies_utils$alienUfoOpened = soundEffect.equals("mob.guardian.curse"); if (!Timer.getInstance().isPresent()) { - ZombiesUtils.getInstance().getLogger().info("Attempting creation of new timer"); new Timer( Scoreboard.getServerNumber().orElseThrow(() -> new RuntimeException("cannot figure out servernumber")), Scoreboard.getMap().orElseThrow(() -> new RuntimeException("cannot figure out map")).map ); } else { Timer timer = Timer.getInstance().get(); - Scoreboard.MapContainer map = Scoreboard.getMap().orElseThrow(() -> new RuntimeException("Scoreboard Error")); + final Scoreboard.MapContainer map = Scoreboard.getMap().orElse(new Scoreboard.MapContainer( + GameMode.getCurrentGameMode().getMap(), + false + )); + if (map.pregame) { - ZombiesUtils.getInstance().getLogger().info("Attempting creation of new timer"); new Timer( Scoreboard.getServerNumber().orElseThrow(() -> new RuntimeException("cannot figure out servernumber")), map.map ); } else if (timer.equalsServerOrNull(Scoreboard.getServerNumber().orElse(null))) timer.split(Scoreboard.getRound()); else { - ZombiesUtils.getInstance().getLogger().info("Attempting creation of new timer"); - //also kills the previous timer using the garbage collector new Timer( Scoreboard.getServerNumber().orElseThrow(() -> new RuntimeException("cannot figure out servernumber")), map.map