diff --git a/src/main/java/com/github/steveice10/mc/protocol/MinecraftProtocol.java b/src/main/java/com/github/steveice10/mc/protocol/MinecraftProtocol.java index 07202086..b7f00c12 100644 --- a/src/main/java/com/github/steveice10/mc/protocol/MinecraftProtocol.java +++ b/src/main/java/com/github/steveice10/mc/protocol/MinecraftProtocol.java @@ -108,7 +108,6 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.entity.spawn.Serve import com.github.steveice10.mc.protocol.packet.ingame.server.entity.spawn.ServerSpawnLivingEntityPacket; import com.github.steveice10.mc.protocol.packet.ingame.server.entity.spawn.ServerSpawnPaintingPacket; import com.github.steveice10.mc.protocol.packet.ingame.server.entity.spawn.ServerSpawnPlayerPacket; -import com.github.steveice10.mc.protocol.packet.ingame.server.entity.spawn.ServerSpawnWeatherEntityPacket; import com.github.steveice10.mc.protocol.packet.ingame.server.scoreboard.ServerDisplayScoreboardPacket; import com.github.steveice10.mc.protocol.packet.ingame.server.scoreboard.ServerScoreboardObjectivePacket; import com.github.steveice10.mc.protocol.packet.ingame.server.scoreboard.ServerTeamPacket; @@ -567,7 +566,7 @@ public class MinecraftProtocol extends PacketProtocol { this.registerOutgoing(0x00, ServerSpawnEntityPacket.class); this.registerOutgoing(0x01, ServerSpawnExpOrbPacket.class); - this.registerOutgoing(0x02, ServerSpawnWeatherEntityPacket.class); + this.registerOutgoing(0x02, ServerSpawnLivingEntityPacket.class); this.registerOutgoing(0x03, ServerSpawnPaintingPacket.class); this.registerOutgoing(0x04, ServerSpawnPlayerPacket.class); this.registerOutgoing(0x05, ServerEntityAnimationPacket.class); diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/entity/spawn/ServerSpawnWeatherEntityPacket.java b/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/entity/spawn/ServerSpawnWeatherEntityPacket.java deleted file mode 100644 index cddd8816..00000000 --- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/entity/spawn/ServerSpawnWeatherEntityPacket.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.github.steveice10.mc.protocol.packet.ingame.server.entity.spawn; - -import com.github.steveice10.mc.protocol.data.MagicValues; -import com.github.steveice10.mc.protocol.data.game.entity.type.WeatherEntityType; -import com.github.steveice10.packetlib.io.NetInput; -import com.github.steveice10.packetlib.io.NetOutput; -import com.github.steveice10.packetlib.packet.Packet; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.NonNull; -import lombok.Setter; - -import java.io.IOException; - -@Data -@Setter(AccessLevel.NONE) -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor -public class ServerSpawnWeatherEntityPacket implements Packet { - private int entityId; - private @NonNull WeatherEntityType type; - private double x; - private double y; - private double z; - - @Override - public void read(NetInput in) throws IOException { - this.entityId = in.readVarInt(); - this.type = MagicValues.key(WeatherEntityType.class, in.readByte()); - this.x = in.readDouble(); - this.y = in.readDouble(); - this.z = in.readDouble(); - } - - @Override - public void write(NetOutput out) throws IOException { - out.writeVarInt(this.entityId); - out.writeByte(MagicValues.value(Integer.class, this.type)); - out.writeDouble(this.x); - out.writeDouble(this.y); - out.writeDouble(this.z); - } - - @Override - public boolean isPriority() { - return false; - } -}