diff --git a/pom.xml b/pom.xml index 56c48e83..d26f33e4 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,12 @@ LATEST provided + + net.ess3 + EssentialsChat + LATEST + provided + diff --git a/src/main/java/com/massivecraft/factions/integration/Essentials.java b/src/main/java/com/massivecraft/factions/integration/Essentials.java index e1661c6a..a5409e52 100644 --- a/src/main/java/com/massivecraft/factions/integration/Essentials.java +++ b/src/main/java/com/massivecraft/factions/integration/Essentials.java @@ -27,7 +27,7 @@ public class Essentials { return false; } - Teleport teleport = (Teleport) essentials.getUser(player).getTeleport(); + Teleport teleport = essentials.getUser(player).getTeleport(); Trade trade = new Trade(Conf.econCostHome, essentials); try { teleport.teleport(loc, trade); diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java index 9dfe77e2..663e1219 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -376,6 +376,7 @@ public class FactionsEntityListener implements Listener { return false; } + /* This hasn't been working so let's just remove it. // Damage will be dealt. However check if the damage should be reduced. if (damage > 0.0 && ownTerritory && Conf.territoryShieldFactor > 0) { double newDamage = Math.ceil(damage * (1D - Conf.territoryShieldFactor)); @@ -386,7 +387,7 @@ public class FactionsEntityListener implements Listener { String perc = MessageFormat.format("{0,number,#%}", (Conf.territoryShieldFactor)); // TODO does this display correctly?? defender.msg("Enemy damage reduced by %s.", perc); } - } + } */ return true; }