Merge branch 'main' of github.com:EvModder/EvMod

Author: EvModder

src/main/java/net/evmodder/evmod/mixin/MixinClientPlayNetworkHandler.java

@@ -35,7 +35,8 @@ abstract class MixinClientPlayNetworkHandler{
 	@Inject(method="onEntitySpawn", at=@At("HEAD"))
 	private final void onSpawn(final EntitySpawnS2CPacket packet, final CallbackInfo _ci){
 		// If the incoming entity is a player and matches your target's UUID
-		if(packet.getEntityType() == EntityType.PLAYER && AccessorMain.getInstance().syncPlayerPos.removeFakePlayer(packet.getUuid())){
+		if(packet.getEntityType() == EntityType.PLAYER && AccessorMain.getInstance().syncPlayerPos != null &&
+				AccessorMain.getInstance().syncPlayerPos.removeFakePlayer(packet.getUuid())){
 			Main.LOGGER.info("[EvMod] Removed dummy player (real player spawned): "+packet.getUuid());
 		}
 	}

src/main/java/net/evmodder/evmod/onTick/MapLoaderBot.java

@@ -112,7 +112,14 @@ private static final void walkTo(PlayerEntity player, final int x, final int z){
 		if(!pairsMatch(state.colors, desiredColors, pixelX, pixelZ, isInMap)){
 			final boolean isEven = (pixelZ&1)==0;
 			if(isEven ? (pixelZ == 0 || pixelZ == 126) : (pixelZ == 1 || pixelZ == 127)){
-				client.player.sendMessage(Text.literal("Waiting for next column"), true);
+				final int prevColX = pixelX+1, prevColZ = pixelZ + (pixelZ == 0 || pixelZ == 126 ? +1 : -1);
+				if(pairsMatch(state.colors, desiredColors, prevColX, prevColZ, /*TODO: detemine for prevXZ!*/false)){
+					client.player.sendMessage(Text.literal("Waiting for next column"), true);
+				}
+				else{
+					client.player.sendMessage(Text.literal("Previous column mismatch!"), true);
+//					walkTo(client.player, playerX+1, playerZ+prevColZ-pixelZ);
+				}
 			}
 			else client.player.sendMessage(Text.literal("Waiting for correct color"), true);
 			return;
@@ -131,7 +138,7 @@ private static final void walkTo(PlayerEntity player, final int x, final int z){
 			if(isEven) z = pixelZ < 64 ? 1 : 127;
 			else z = pixelZ < 64 ? 0 : 126;
 			client.player.sendMessage(Text.literal("Walking to start of next column"), true);
-			walkTo(client.player, playerX-1, playerZ + (z-pixelZ));
+			walkTo(client.player, playerX-1, playerZ+(z-pixelZ));
 		}
 	}
 }