Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-14 19:32:17 +01:00
Code Issues Projects Releases Wiki Activity

fix: particle packet reorder

Browse Source
This commit is contained in:
mworzala 2024-04-23 17:44:45 -04:00 committed by Matt Worzala
parent 60d632404f
commit 92ce3e6d34
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/network/packet/server/play/ParticlePacket.java
View File

@ -38,7 +38,6 @@ public record ParticlePacket(int particleId, boolean longDistance, double x, dou
} }
private static ParticlePacket readPacket(NetworkBuffer reader) { private static ParticlePacket readPacket(NetworkBuffer reader) {
int particleId = reader.read(VAR_INT);
Boolean longDistance = reader.read(BOOLEAN); Boolean longDistance = reader.read(BOOLEAN);
Double x = reader.read(DOUBLE); Double x = reader.read(DOUBLE);
Double y = reader.read(DOUBLE); Double y = reader.read(DOUBLE);
@ -48,6 +47,8 @@ public record ParticlePacket(int particleId, boolean longDistance, double x, dou
Float offsetZ = reader.read(FLOAT); Float offsetZ = reader.read(FLOAT);
Float maxSpeed = reader.read(FLOAT); Float maxSpeed = reader.read(FLOAT);
Integer particleCount = reader.read(INT); Integer particleCount = reader.read(INT);
int particleId = reader.read(VAR_INT);
ParticleData data = ParticleData.read(particleId, reader); ParticleData data = ParticleData.read(particleId, reader);
return new ParticlePacket(particleId, longDistance, x, y, z, offsetX, offsetY, offsetZ, maxSpeed, particleCount, data); return new ParticlePacket(particleId, longDistance, x, y, z, offsetX, offsetY, offsetZ, maxSpeed, particleCount, data);
@ -58,7 +59,6 @@ public record ParticlePacket(int particleId, boolean longDistance, double x, dou
Check.stateCondition(data != null && !data.validate(particleId), "Particle data {0} is not valid for this particle type {1}", data, Particle.fromId(particleId)); Check.stateCondition(data != null && !data.validate(particleId), "Particle data {0} is not valid for this particle type {1}", data, Particle.fromId(particleId));
Check.stateCondition(data == null && ParticleData.requiresData(particleId), "Particle data is required for this particle type {0}", Particle.fromId(particleId)); Check.stateCondition(data == null && ParticleData.requiresData(particleId), "Particle data is required for this particle type {0}", Particle.fromId(particleId));
writer.write(VAR_INT, particleId);
writer.write(BOOLEAN, longDistance); writer.write(BOOLEAN, longDistance);
writer.write(DOUBLE, x); writer.write(DOUBLE, x);
writer.write(DOUBLE, y); writer.write(DOUBLE, y);
@ -69,6 +69,7 @@ public record ParticlePacket(int particleId, boolean longDistance, double x, dou
writer.write(FLOAT, maxSpeed); writer.write(FLOAT, maxSpeed);
writer.write(INT, particleCount); writer.write(INT, particleCount);
writer.write(VAR_INT, particleId);
if (data != null) data.write(writer); if (data != null) data.write(writer);
} }