diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index e259cf9..818ef11 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/plugin.yml b/src/plugin.yml index e55d5a8..754fd40 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper -version: 3.7.1 +version: 3.7.1r1 commands: money: description: Tells the player the amount of money they are holding. diff --git a/src/sig/plugin/TwosideKeeper/NewCombat.java b/src/sig/plugin/TwosideKeeper/NewCombat.java index e7e89a7..9479db5 100644 --- a/src/sig/plugin/TwosideKeeper/NewCombat.java +++ b/src/sig/plugin/TwosideKeeper/NewCombat.java @@ -355,9 +355,10 @@ public class NewCombat { FallingBlock fb = (FallingBlock)b.getLocation().getWorld().spawnFallingBlock(b.getLocation().add(0,0.1,0),b.getType(),(byte)0); fb.setVelocity(new Vector(0,Math.random()*1.35,0)); fb.setMetadata("FAKE", new FixedMetadataValue(TwosideKeeper.plugin,true)); - b.breakNaturally(); - aPlugin.API.sendSoundlessExplosion(b.getLocation(), 3); - p.playSound(mon.getLocation(), Sound.BLOCK_CHORUS_FLOWER_DEATH, 1.0f, 1.0f); + //b.breakNaturally(); + b.setType(Material.AIR); + aPlugin.API.sendSoundlessExplosion(b.getLocation(), 1); + p.playSound(mon.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 1.0f, 1.0f); } } } diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index 946bea5..b2bb535 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -2618,7 +2618,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { itemCube_saveConfig(ITEMCUBEID, new ArrayList(), cubetype); ITEMCUBEID++; } - } + } } } } @@ -2628,7 +2628,14 @@ public class TwosideKeeper extends JavaPlugin implements Listener { if (ev.getEntity() instanceof FallingBlock) { FallingBlock fb = (FallingBlock)ev.getEntity(); if (fb.hasMetadata("FAKE")) { - ev.setCancelled(true); + final Block b = ev.getBlock(); + Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() { + @Override + public void run() { + b.getLocation().getWorld().playSound(b.getLocation(), Sound.BLOCK_CHORUS_FLOWER_DEATH, 1.0f, 1.0f); + b.breakNaturally(); + } + },1); } } }