Bug fix in waypoints/logoutspots

Author: cev-api

src/main/java/net/wurstclient/hacks/LogoutSpotsHack.java

@@ -34,17 +34,15 @@ public final class LogoutSpotsHack extends Hack
 {
 	private static final class Entry
 	{
-		final UUID uuid;
 		final String name;
 		final Box box;
-		final float health;
+		final String dimKey;
 
-		Entry(UUID u, String n, Box b, float h)
+		Entry(UUID u, String n, Box b, float h, String dim)
 		{
-			uuid = u;
 			name = n;
 			box = b;
-			health = h;
+			dimKey = dim;
 		}
 	}
 
@@ -112,8 +110,8 @@ public void onUpdate()
 					{
 						Box b = p.getBoundingBox();
 						float h = p.getHealth();
-						spots.put(id,
-							new Entry(id, p.getName().getString(), b, h));
+						spots.put(id, new Entry(id, p.getName().getString(), b,
+							h, currentDimKey()));
 					}
 				}
 			snapshot();
@@ -126,6 +124,13 @@ public void onUpdate()
 		}
 	}
 
+	private String currentDimKey()
+	{
+		if(MC.world == null)
+			return "overworld";
+		return MC.world.getRegistryKey().getValue().getPath();
+	}
+	
 	private void snapshot()
 	{
 		if(MC.getNetworkHandler() != null)
@@ -145,11 +150,15 @@ public void onRender(MatrixStack matrices, float partialTicks)
 	{
 		if(spots.isEmpty())
 			return;
+		String curDim = currentDimKey();
 		int sides = sideColor.getColorI(0x40);
 		int lines = lineColor.getColorI(0xFF);
-		var boxes = new java.util.ArrayList<Box>(spots.size());
+		var boxes = new java.util.ArrayList<Box>();
 		for(var e : spots.values())
-			boxes.add(e.box);
+			if(e.dimKey.equals(curDim))
+				boxes.add(e.box);
+		if(boxes.isEmpty())
+			return;
 		RenderUtils.drawSolidBoxes(matrices, boxes, sides, false);
 		RenderUtils.drawOutlinedBoxes(matrices, boxes, lines, false);
 		// (Optional) draw tracers to centers
@@ -160,6 +169,8 @@ public void onRender(MatrixStack matrices, float partialTicks)
 		}
 		for(var e : spots.values())
 		{
+			if(!e.dimKey.equals(curDim))
+				continue;
 			var c = e.box.getCenter();
 			drawWorldLabel(matrices, e.name, c.x, e.box.maxY + 0.5, c.z,
 				0xFFFFFFFF, scale.getValueF());
@@ -184,6 +195,7 @@ private void drawWorldLabel(MatrixStack matrices, String text, double x,
 		var matrix = matrices.peek().getPositionMatrix();
 		tr.draw(text, -w, 0, argb, false, matrix, vcp,
 			TextRenderer.TextLayerType.SEE_THROUGH, bg, 0xF000F0);
+		vcp.draw();
 		matrices.pop();
 	}
 }

src/main/java/net/wurstclient/hacks/WaypointsHack.java

@@ -15,6 +15,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.Locale;
 
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.network.ServerInfo;
@@ -31,7 +32,6 @@
 import net.wurstclient.events.RenderListener;
 import net.wurstclient.hack.Hack;
 import net.wurstclient.events.ChatInputListener;
-import net.wurstclient.events.ChatInputListener.ChatInputEvent;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.ColorSetting;
@@ -145,8 +145,7 @@ public void onUpdate()
 				if(p == MC.player)
 					continue;
 				UUID id = p.getUuid();
-				boolean deadNow =
-					p.getHealth() <= 0 || p.isDead() || p.isRemoved();
+				boolean deadNow = p.getHealth() <= 0 || p.isDead();
 				boolean wasDead = knownDead.contains(id);
 				if(deadNow && !wasDead)
 				{
@@ -207,6 +206,9 @@ public void onReceivedMessage(ChatInputEvent event)
 		String msg = event.getComponent().getString();
 		if(msg == null || msg.isEmpty())
 			return;
+		String lower = msg.toLowerCase(Locale.ROOT);
+		if(lower.contains("left the game") || lower.contains("joined the game"))
+			return; // ignore login/logout messages
 		long now = System.currentTimeMillis();
 		// Try to match standard death messages: "<name> ..."
 		for(var p : MC.world.getPlayers())