diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cf40006c0..db9a7c67b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ adventure = "4.9.3" kotlin = "1.6.10" hydrazine = "1.7.2" dependencyGetter = "v1.0.1" -minestomData = "eadcb99e14" +minestomData = "cb6bac3fbc" hephaistos = "2.4.2" jetbrainsAnnotations = "23.0.0" diff --git a/src/main/java/net/minestom/server/MinecraftServer.java b/src/main/java/net/minestom/server/MinecraftServer.java index 7d6a0af39..bff1fa29b 100644 --- a/src/main/java/net/minestom/server/MinecraftServer.java +++ b/src/main/java/net/minestom/server/MinecraftServer.java @@ -46,8 +46,8 @@ public final class MinecraftServer { public final static Logger LOGGER = LoggerFactory.getLogger(MinecraftServer.class); - public static final String VERSION_NAME = "1.18.1"; - public static final int PROTOCOL_VERSION = 757; + public static final String VERSION_NAME = "1.18.2"; + public static final int PROTOCOL_VERSION = 758; // Threads public static final String THREAD_NAME_BENCHMARK = "Ms-Benchmark"; diff --git a/src/main/java/net/minestom/server/network/packet/server/play/JoinGamePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/JoinGamePacket.java index 724dea46b..5c40bfe46 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/JoinGamePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/JoinGamePacket.java @@ -33,9 +33,7 @@ public record JoinGamePacket(int entityId, boolean isHardcore, GameMode gameMode writer.writeByte((byte) -1); } - //array of worlds - writer.writeVarInt(1); - writer.writeSizedString("minestom:world"); + writer.writeVarIntList(worlds, BinaryWriter::writeSizedString); writer.writeNBT("", dimensionCodec); writer.writeNBT("", dimension); diff --git a/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java index 5d5655fcc..a69b1acab 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/RemoveEntityEffectPacket.java @@ -11,13 +11,13 @@ import java.util.Objects; public record RemoveEntityEffectPacket(int entityId, @NotNull PotionEffect potionEffect) implements ServerPacket { public RemoveEntityEffectPacket(BinaryReader reader) { - this(reader.readVarInt(), Objects.requireNonNull(PotionEffect.fromId(reader.readByte()))); + this(reader.readVarInt(), Objects.requireNonNull(PotionEffect.fromId(reader.readVarInt()))); } @Override public void write(@NotNull BinaryWriter writer) { writer.writeVarInt(entityId); - writer.writeByte((byte) potionEffect.id()); + writer.writeVarInt(potionEffect.id()); } @Override diff --git a/src/main/java/net/minestom/server/potion/Potion.java b/src/main/java/net/minestom/server/potion/Potion.java index 8edf3a79d..181bfb37b 100644 --- a/src/main/java/net/minestom/server/potion/Potion.java +++ b/src/main/java/net/minestom/server/potion/Potion.java @@ -109,7 +109,7 @@ public record Potion(@NotNull PotionEffect effect, byte amplifier, @Override public void write(@NotNull BinaryWriter writer) { - writer.writeByte((byte) effect.id()); + writer.writeVarInt(effect.id()); writer.writeByte(amplifier); writer.writeVarInt(duration); writer.writeByte(flags); diff --git a/src/main/java/net/minestom/server/world/DimensionType.java b/src/main/java/net/minestom/server/world/DimensionType.java index 22a8b29fa..bbd7d72ec 100644 --- a/src/main/java/net/minestom/server/world/DimensionType.java +++ b/src/main/java/net/minestom/server/world/DimensionType.java @@ -94,7 +94,7 @@ public class DimensionType { public static DimensionType fromNBT(NBTCompound nbt) { return DimensionType.builder(NamespaceID.from(nbt.getString("name"))) .ambientLight(nbt.getFloat("ambient_light")) - .infiniburn(NamespaceID.from(nbt.getString("infiniburn"))) + .infiniburn(NamespaceID.from(nbt.getString("infiniburn").replaceFirst("#", ""))) .natural(nbt.getByte("natural") != 0) .ceilingEnabled(nbt.getByte("has_ceiling") != 0) .skylightEnabled(nbt.getByte("has_skylight") != 0) @@ -121,7 +121,7 @@ public class DimensionType { public NBTCompound toNBT() { return NBT.Compound(nbt -> { nbt.setFloat("ambient_light", ambientLight); - nbt.setString("infiniburn", infiniburn.toString()); + nbt.setString("infiniburn", "#" + infiniburn.toString()); nbt.setByte("natural", (byte) (natural ? 0x01 : 0x00)); nbt.setByte("has_ceiling", (byte) (ceilingEnabled ? 0x01 : 0x00)); nbt.setByte("has_skylight", (byte) (skylightEnabled ? 0x01 : 0x00));