From c95e596227fca3a90225904283e9a39520006a6a Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 19 Dec 2023 15:31:11 +0100 Subject: [PATCH] Adopted new ClientboundRespawnPacket-constructor --- .../betterend/portal/TravelerState.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/betterx/betterend/portal/TravelerState.java b/src/main/java/org/betterx/betterend/portal/TravelerState.java index d07f4870..7290823b 100644 --- a/src/main/java/org/betterx/betterend/portal/TravelerState.java +++ b/src/main/java/org/betterx/betterend/portal/TravelerState.java @@ -170,6 +170,20 @@ public final class TravelerState { return null; } + private static CommonPlayerSpawnInfo newCommonPlayerSpawnInfo(ServerPlayer traveler, ServerLevel serverLevel) { + return new CommonPlayerSpawnInfo( + serverLevel.dimensionTypeId(), + serverLevel.dimension(), + BiomeManager.obfuscateSeed(serverLevel.getSeed()), + traveler.gameMode.getGameModeForPlayer(), + traveler.gameMode.getPreviousGameModeForPlayer(), + serverLevel.isDebug(), + serverLevel.isFlat(), + traveler.getLastDeathLocation(), + traveler.getPortalCooldown() + ); + } + public static Entity travelToDimension( ServerPlayer traveler, ServerLevel serverLevel, @@ -183,16 +197,8 @@ public final class TravelerState { traveler.unRide(); traveler.connection.send(new ClientboundRespawnPacket( - serverLevel.dimensionTypeId(), - serverLevel.dimension(), - BiomeManager.obfuscateSeed(serverLevel.getSeed()), - traveler.gameMode.getGameModeForPlayer(), - traveler.gameMode.getPreviousGameModeForPlayer(), - serverLevel.isDebug(), - serverLevel.isFlat(), - ClientboundRespawnPacket.KEEP_ALL_DATA, - traveler.getLastDeathLocation(), - traveler.getPortalCooldown() + newCommonPlayerSpawnInfo(traveler, serverLevel), + ClientboundRespawnPacket.KEEP_ALL_DATA )); traveler.connection.send(new ClientboundChangeDifficultyPacket( levelData.getDifficulty(),