Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-30 06:03:59 +01:00
Code Issues Projects Releases Wiki Activity

Comment out territory shield because modifying the damage just doesn't want to work.

Browse Source
This commit is contained in:
drtshock 2014-07-08 13:54:22 -05:00
parent 0d0085f423
commit 1fa7e28ffd
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -71,6 +71,12 @@
<version>LATEST</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.ess3</groupId>
<artifactId>EssentialsChat</artifactId>
<version>LATEST</version>
<scope>provided</scope>
</dependency>
</dependencies>
<repositories>

2
src/main/java/com/massivecraft/factions/integration/Essentials.java
View File

@ -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);

3
src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -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("<i>Enemy damage reduced by <rose>%s<i>.", perc);
}
}
} */
return true;
}