diff --git a/pom.xml b/pom.xml index e3d0f201..814f144c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.projectkorra projectkorra - 1.8.1 + 1.8.2 jar ProjectKorra diff --git a/src/com/projectkorra/projectkorra/ability/util/CollisionManager.java b/src/com/projectkorra/projectkorra/ability/util/CollisionManager.java index 866d6f20..1790e41e 100644 --- a/src/com/projectkorra/projectkorra/ability/util/CollisionManager.java +++ b/src/com/projectkorra/projectkorra/ability/util/CollisionManager.java @@ -131,7 +131,10 @@ public class CollisionManager { if (locationSecond == null) { continue; } - + + if (locationFirst.getWorld() != locationSecond.getWorld()) { + return; + } double distSquared = locationFirst.distanceSquared(locationSecond); if (distSquared <= requiredDistSquared) { collided = true; diff --git a/src/com/projectkorra/projectkorra/firebending/HeatControl.java b/src/com/projectkorra/projectkorra/firebending/HeatControl.java index d9d7e787..1873031a 100644 --- a/src/com/projectkorra/projectkorra/firebending/HeatControl.java +++ b/src/com/projectkorra/projectkorra/firebending/HeatControl.java @@ -320,12 +320,21 @@ public class HeatControl extends FireAbility { @Override public void run() { if (tempBlock != null) { + boolean bool = Math.random() > .5 ? true : false; if (solidifyRevert) { - tempBlock.setType(Material.STONE, (byte) 0); + if (bool) { + tempBlock.setType(Material.STONE, (byte) 0); + } else { + tempBlock.setType(Material.COBBLESTONE, (byte) 0); + } tempBlock.setRevertTime(solidifyRevertTime); } else { tempBlock.revertBlock(); - tempBlock.getBlock().setType(Material.STONE); + if (bool) { + tempBlock.getBlock().setType(Material.STONE); + } else { + tempBlock.getBlock().setType(Material.COBBLESTONE); + } } ParticleEffect.SMOKE.display(tempBlock.getBlock().getLocation().clone().add(0.5, 1, 0.5), 0.1F, 0.1F, 0.1F, 0.01F, 3);