From f6c91085b6dd307ecaf25fbe49b7a405ed6af945 Mon Sep 17 00:00:00 2001 From: mworzala Date: Tue, 4 Jul 2023 21:21:59 -0400 Subject: [PATCH] hollow-cube/dimension-names-part-2 (cherry picked from commit 3dbf364340bc77bc6c065b027e097f93e6c82cb3) --- src/main/java/net/minestom/server/entity/Player.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java index 4c876a439..816980d31 100644 --- a/src/main/java/net/minestom/server/entity/Player.java +++ b/src/main/java/net/minestom/server/entity/Player.java @@ -283,7 +283,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable, "value", NBT.List(NBTType.TAG_Compound, damageTypes) ))); final JoinGamePacket joinGamePacket = new JoinGamePacket(getEntityId(), false, gameMode, null, - List.of(dimensionType.getName().asString()), NBT.Compound(registry), dimensionType.toString(), dimensionType.getName().asString(), + List.of(), NBT.Compound(registry), dimensionType.toString(), spawnInstance.getDimensionName(), 0, 0, MinecraftServer.getChunkViewDistance(), MinecraftServer.getChunkViewDistance(), false, true, false, levelFlat, deathLocation, portalCooldown); sendPacket(joinGamePacket); @@ -607,7 +607,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable, } // Must update the player chunks chunkUpdateLimitChecker.clearHistory(); - final boolean dimensionChange = !Objects.equals(dimensionType, instance.getDimensionType()); + final boolean dimensionChange = currentInstance != null && !Objects.equals(currentInstance.getDimensionName(), instance.getDimensionName()); final Consumer runnable = (i) -> spawnPlayer(i, spawnPosition, currentInstance == null, dimensionChange, true); @@ -1423,7 +1423,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable, * @param dimensionType the new player dimension */ protected void sendDimension(@NotNull DimensionType dimensionType, @NotNull String dimensionName) { - Check.argCondition(dimensionType.equals(getDimensionType()), + Check.argCondition(instance.getDimensionName().equals(dimensionName), "The dimension needs to be different than the current one!"); this.dimensionType = dimensionType; sendPacket(new RespawnPacket(dimensionType.toString(), dimensionName,