From 613001a600980eacc0afe9e70fa269036c87ea8d Mon Sep 17 00:00:00 2001 From: Matsv Date: Wed, 4 Apr 2018 21:46:59 +0200 Subject: [PATCH] Handle removed particles --- .../protocolsnapshotto1_12_2/data/ParticleRewriter.java | 2 +- .../protocolsnapshotto1_12_2/packets/WorldPackets.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/ParticleRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/ParticleRewriter.java index 810cf757b..d07abd85b 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/ParticleRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/ParticleRewriter.java @@ -111,7 +111,7 @@ public class ParticleRewriter { particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomFloat())); // Red 0 - 1 particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomFloat())); // Green 0 - 1 particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomFloat())); // Blue 0 - 1 - particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 1));// Scale 0.01 - 4 TODO test scale + particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 1));// Scale 0.01 - 4 return particle; } }; diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/WorldPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/WorldPackets.java index 169315543..46cb930ef 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/WorldPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/WorldPackets.java @@ -224,8 +224,8 @@ public class WorldPackets { Particle particle = ParticleRewriter.rewriteParticle(particleId, data); - // Cancel if null - if (particle == null) { + // Cancel if null or completely removed + if (particle == null || particle.getId() == -1) { wrapper.cancel(); return; }