mirror of
https://github.com/MassiveCraft/Factions.git
synced 2024-12-02 15:13:33 +01:00
Comment out territory shield because modifying the damage just doesn't want to work.
This commit is contained in:
parent
0d0085f423
commit
1fa7e28ffd
6
pom.xml
6
pom.xml
@ -71,6 +71,12 @@
|
|||||||
<version>LATEST</version>
|
<version>LATEST</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.ess3</groupId>
|
||||||
|
<artifactId>EssentialsChat</artifactId>
|
||||||
|
<version>LATEST</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
|
@ -27,7 +27,7 @@ public class Essentials {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Teleport teleport = (Teleport) essentials.getUser(player).getTeleport();
|
Teleport teleport = essentials.getUser(player).getTeleport();
|
||||||
Trade trade = new Trade(Conf.econCostHome, essentials);
|
Trade trade = new Trade(Conf.econCostHome, essentials);
|
||||||
try {
|
try {
|
||||||
teleport.teleport(loc, trade);
|
teleport.teleport(loc, trade);
|
||||||
|
@ -376,6 +376,7 @@ public class FactionsEntityListener implements Listener {
|
|||||||
return false;
|
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.
|
// Damage will be dealt. However check if the damage should be reduced.
|
||||||
if (damage > 0.0 && ownTerritory && Conf.territoryShieldFactor > 0) {
|
if (damage > 0.0 && ownTerritory && Conf.territoryShieldFactor > 0) {
|
||||||
double newDamage = Math.ceil(damage * (1D - Conf.territoryShieldFactor));
|
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??
|
String perc = MessageFormat.format("{0,number,#%}", (Conf.territoryShieldFactor)); // TODO does this display correctly??
|
||||||
defender.msg("<i>Enemy damage reduced by <rose>%s<i>.", perc);
|
defender.msg("<i>Enemy damage reduced by <rose>%s<i>.", perc);
|
||||||
}
|
}
|
||||||
}
|
} */
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user