Skip to content

Commit

Permalink
Fix 1.13 blockcrack handling, fixes #1947
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmonkey4eva committed Apr 6, 2019
1 parent 24e7c62 commit d6d70ae
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 4 deletions.
Expand Up @@ -37,10 +37,10 @@ public ParticleHelper() {
}

public HashMap<String, Effect> effectRemap = new HashMap<>();
private final Map<String, Particle> particles = new HashMap<>();
private final List<Particle> visibleParticles = new ArrayList<>();
public final Map<String, Particle> particles = new HashMap<>();
public final List<Particle> visibleParticles = new ArrayList<>();

protected void register(String name, Particle particle) {
public void register(String name, Particle particle) {
particles.put(name.toUpperCase(), particle);
if (particle.isVisible()) {
visibleParticles.add(particle);
Expand Down
Expand Up @@ -48,7 +48,7 @@ public class Handler_v1_13_R2 extends NMSHandler {
private final ItemHelper itemHelper = new ItemHelper_v1_13_R2();
private final SoundHelper soundHelper = new SoundHelper_v1_13_R2();
private final PacketHelper packetHelper = new PacketHelper_v1_13_R2();
private final ParticleHelper particleHelper = new ParticleHelper();
private final ParticleHelper particleHelper = new ParticleHelper_v1_13_R2();
private final PlayerHelper playerHelper = new PlayerHelper_v1_13_R2();
private final WorldHelper worldHelper = new WorldHelper_v1_13_R2();

Expand Down
@@ -0,0 +1,13 @@
package net.aufdemrand.denizen.nms.helpers;

import net.aufdemrand.denizen.nms.abstracts.ParticleHelper;
import net.aufdemrand.denizen.nms.impl.Particle_v1_13_R2;
import net.aufdemrand.denizen.nms.interfaces.Particle;

public class ParticleHelper_v1_13_R2 extends ParticleHelper {

@Override
public void register(String name, Particle particle) {
super.register(name, new Particle_v1_13_R2(particle.particle));
}
}
@@ -0,0 +1,26 @@
package net.aufdemrand.denizen.nms.impl;

import net.aufdemrand.denizen.nms.interfaces.Particle;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_13_R2.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_13_R2.util.CraftMagicNumbers;
import org.bukkit.entity.Player;
import org.bukkit.material.MaterialData;
import org.bukkit.util.Vector;

public class Particle_v1_13_R2 extends Particle {

public Particle_v1_13_R2(org.bukkit.Particle particle) {
super(particle);
}

@Override
public <T> void playFor(Player player, Location location, int count, Vector offset, double extra, T data) {
if (data instanceof MaterialData) {
super.playFor(player, location, count, offset, extra, CraftBlockData.fromData(CraftMagicNumbers.getBlock((MaterialData) data)));
}
else {
super.playFor(player, location, count, offset, extra, data);
}
}
}

0 comments on commit d6d70ae

Please sign in to comment.