Hypixel Fix 1.16

mod/src/main/java/eu/the5zig/mod/BytecodeHook.java

@@ -16,7 +16,9 @@
  * along with The 5zig Mod.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package eu.the5zig.mod;import com.mojang.authlib.GameProfile;
+package eu.the5zig.mod;
+
+import com.mojang.authlib.GameProfile;
 import eu.the5zig.mod.gui.ingame.ItemStack;
 import eu.the5zig.mod.manager.DeathLocation;
 import eu.the5zig.mod.manager.WorldType;
@@ -226,6 +228,11 @@ public static void onSetSlot(int slot, ItemStack itemStack) {
 		The5zigMod.getListener().onInventorySetSlot(slot, itemStack);
 	}
 
+	@BytecodeAccess
+	public static void onWorldSwitch() {
+		The5zigMod.getListener().onWorldSwitch();
+	}
+
 	@BytecodeAccess
 	public static void onGuiDisconnectedInit(Object parentScreen) {
 		The5zigMod.getDataManager().getAutoReconnectManager().startCountdown(parentScreen);

mod/src/main/java/eu/the5zig/mod/listener/EventListener.java

@@ -280,6 +280,10 @@ public void onInventorySetSlot(int slot, ItemStack itemStack) {
 		}
 	}
 
+	public void onWorldSwitch() {
+		fireEvent(new PlayerWorldSwitchEvent());
+	}
+
 	public String[] onSignEdited(String[] lines) {
 		SignEditEvent event = fireEvent(new SignEditEvent(lines));
 		return event.getLines();

mod/src/main/java/eu/the5zig/mod/listener/IListener.java

@@ -64,4 +64,6 @@ public interface IListener {
 
 	void onTitle(String title, String subTitle);
 
+	void onWorldSwitch();
+
 }

mod/src/main/java/eu/the5zig/mod/listener/Listener.java

@@ -79,4 +79,8 @@ public void onPlayerListHeaderFooter(String header, String footer) {
 	@Override
 	public void onTitle(String title, String subTitle) {
 	}
+
+	@Override
+	public void onWorldSwitch() {
+	}
 }

mod/src/main/java/eu/the5zig/mod/server/RegisteredServerInstance.java

@@ -385,6 +385,19 @@ public void call(AbstractGameListener callback) {
 		});
 	}
 
+	@EventHandler
+	public void onWorldSwitch(final PlayerWorldSwitchEvent event) {
+		if (!isCurrentServerInstance())
+			return;
+		executeAll(new Callback<AbstractGameListener>() {
+			@Override
+			@SuppressWarnings("unchecked")
+			public void call(AbstractGameListener callback) {
+				callback.onWorldSwitch(getCurrentGameMode());
+			}
+		});
+	}
+
 	private boolean tryMatch(final String message) {
 		final List<List<String>> matchedKeys = match(ChatColor.stripColor(message));
 		if (matchedKeys.isEmpty())

mod/src/main/java/eu/the5zig/mod/server/hypixel/HypixelListener.java

@@ -90,4 +90,8 @@ public void onServerConnect(GameMode gameMode) {
 		The5zigMod.getHypixelAPIManager().checkFriendSuggestions();
 	}
 
+	@Override
+	public void onWorldSwitch(GameMode gameMode) {
+		getGameListener().sendAndIgnore("/whereami", "lobby");
+	}
 }

mod/src/main/resources/mixins.json

@@ -27,6 +27,7 @@
     "MixinGuiConnecting",
     "MixinGuiDisconnected",
     "MixinServerListEntry",
-    "MixinGuiGameOver"
+    "MixinGuiGameOver",
+    "MixinClientWorld"
   ]
 }

mod/src/main/resources/the5zigmod.mixins.json

@@ -20,6 +20,7 @@
     "MixinGuiDisconnected",
     "MixinGuiGameOver",
     "MixinGuiMainMenu",
-    "MixinGuiPlayerTabOverlay"
+    "MixinGuiPlayerTabOverlay",
+    "MixinClientWorld"
   ]
 }