From 49b67c2355a5b18f0b302eb9a70b09d81123278c Mon Sep 17 00:00:00 2001 From: Malte Reents Date: Mon, 22 Jan 2024 13:28:38 +0100 Subject: [PATCH] Fixed wrong username output Wenn ein spieler respawnt, wird jetzt der richtige Spielername genannt --- src/client/java/modchest/REServerModClient.java | 2 +- .../modchest/networking/packet/respawnRequestS2CPacket.java | 2 +- src/main/java/modchest/REServerMod.java | 6 ++++-- src/main/java/modchest/mixin/bedBlock.java | 2 +- .../networking/packet/deathScreenMultiButtonsC2SPacket.java | 3 +-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/client/java/modchest/REServerModClient.java b/src/client/java/modchest/REServerModClient.java index 7ed34a4..0d18944 100644 --- a/src/client/java/modchest/REServerModClient.java +++ b/src/client/java/modchest/REServerModClient.java @@ -13,6 +13,6 @@ public class REServerModClient implements ClientModInitializer { modNetworkingClient.registerC2SPackets(); //Identifier unter denen der Client zuhoert werden registriert - LOGGER.info("Modchest successfully loaded!"); + LOGGER.info("Modchest-Client successfully loaded!"); } } \ No newline at end of file diff --git a/src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java b/src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java index 12c10c9..d2e9aa9 100644 --- a/src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java +++ b/src/client/java/modchest/networking/packet/respawnRequestS2CPacket.java @@ -9,7 +9,7 @@ import net.minecraft.network.PacketByteBuf; public class respawnRequestS2CPacket { public static void receive(MinecraftClient minecraftClient, ClientPlayNetworkHandler clientPlayNetworkHandler, PacketByteBuf packetByteBuf, PacketSender packetSender) { - REServerModClient.LOGGER.info("Server asked for respawn after pressing a saved respawn button!"); + //REServerModClient.LOGGER.info("Server asked for respawn after pressing a saved respawn button!"); minecraftClient.player.requestRespawn(); } } diff --git a/src/main/java/modchest/REServerMod.java b/src/main/java/modchest/REServerMod.java index 8430a45..37c25ad 100644 --- a/src/main/java/modchest/REServerMod.java +++ b/src/main/java/modchest/REServerMod.java @@ -11,10 +11,12 @@ public class REServerMod implements ModInitializer { public static final String MOD_ID = "modchest"; public static final Logger LOGGER = LoggerFactory.getLogger("modchest"); // Erster Error Logger + //TODO: beim bett wird noch im zwei block-radius gesucht, damit der respawn point auch gelöscht wird, wenn man nur einen der beiden hälften zerstört + @Override public void onInitialize() { //Der uebersicht halber sind jetzt alle initializer in Klassen in util in initializer - //initializer.itemGroups(); - //initializer.itemsAndBlocks(); + initializer.itemGroups(); + initializer.itemsAndBlocks(); initializer.events(); initializer.networking(); diff --git a/src/main/java/modchest/mixin/bedBlock.java b/src/main/java/modchest/mixin/bedBlock.java index 41f3cd4..29ad343 100644 --- a/src/main/java/modchest/mixin/bedBlock.java +++ b/src/main/java/modchest/mixin/bedBlock.java @@ -38,7 +38,7 @@ public class bedBlock { } catch (Exception e) { REServerMod.LOGGER.info("Error casting playerArray to ServerPlayerEntity: " + e); } - if (inRange(pos.getX(), posXYZ[0], 1) && inRange(pos.getY(), posXYZ[1], 1) && inRange(pos.getZ(), posXYZ[2], 1)) { //Gleicht ab, ob die Koordinaten uebereinstimmen; die Spawnpunkte sind nicht immer ganz sauber, daher wird in Blockrange 1 geschaut + if (inRange(pos.getX(), posXYZ[0], 2) && inRange(pos.getY(), posXYZ[1], 2) && inRange(pos.getZ(), posXYZ[2], 2)) { //TODO: change range to 1 //Gleicht ab, ob die Koordinaten uebereinstimmen; die Spawnpunkte sind nicht immer ganz sauber, daher wird in Blockrange 1 geschaut try { //Sollte der Code doch ausversehen auf dem Client ausgefuehrt werden, wuerde die folgende Zeile einen Error schmeissen setAndGet.setMultiSpawnBlank((ServerPlayerEntity) playerArray.get(i), j); //Wird ein bett zerstoert, wird der Spawnpunkt geblanked } catch (Exception e) { diff --git a/src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java b/src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java index 078549d..63440ce 100644 --- a/src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java +++ b/src/main/java/modchest/networking/packet/deathScreenMultiButtonsC2SPacket.java @@ -38,7 +38,7 @@ public class deathScreenMultiButtonsC2SPacket { player.setSpawnPoint(World.OVERWORLD, new BlockPos(posXYZ[0], posXYZ[1], posXYZ[2]), 0, true, true); //neuer Spawn wird gesetzt ServerPlayNetworking.send(player, modNetworkingServer.request_respawn, PacketByteBufs.create()); //Anfrage an den Client zum respawnen wird gesendet player.sendMessage((Text.translatable("chat.modchest.multispawn.respawned", num))); - REServerMod.LOGGER.info("Respawned Player: " + player.getDisplayName() + "at " + Arrays.toString(setAndGet.getMultiSpawn(player, num))); + REServerMod.LOGGER.info("Respawned Player " + player.getEntityName() + " at " + Arrays.toString(setAndGet.getMultiSpawn(player, num))); setAndGet.setMultiSpawn(player, 6); } catch (Exception e) { REServerMod.LOGGER.info("Sorry! Following error, trying to respawn player " + player.getDisplayName() + ": " + e); @@ -50,6 +50,5 @@ public class deathScreenMultiButtonsC2SPacket { player.sendMessage(Text.translatable("chat.modchest.multispawn.spawnnotset")); } } - } }