sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

REbuild.

Browse Source
This commit is contained in:
sigonasr2 2016-08-04 00:18:10 -05:00
parent c9c7f11d2a
commit 5eaea8ae5d
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

2
src/plugin.yml
View File

@ -1,6 +1,6 @@
name: TwosideKeeper name: TwosideKeeper
main: sig.plugin.TwosideKeeper.TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper
version: 3.7.3br1 version: 3.7.3br2
commands: commands:
money: money:
description: Tells the player the amount of money they are holding. description: Tells the player the amount of money they are holding.

2
src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
View File

@ -2794,7 +2794,7 @@ public class GenericFunctions {
//Bukkit.getPluginManager().callEvent(new EntityDamageByEntityEvent(damager,entity,DamageCause.CUSTOM,dmg+TwosideKeeper.CUSTOM_DAMAGE_IDENTIFIER)); //Bukkit.getPluginManager().callEvent(new EntityDamageByEntityEvent(damager,entity,DamageCause.CUSTOM,dmg+TwosideKeeper.CUSTOM_DAMAGE_IDENTIFIER));
} else { } else {
//Use old system if we cannot get a valid damager. //Use old system if we cannot get a valid damager.
if (entity.getHealth()>dmg) { if (entity.getHealth()>dmg) {
entity.setHealth(entity.getHealth()-dmg); entity.setHealth(entity.getHealth()-dmg);
aPlugin.API.sendEntityHurtAnimation(entity); aPlugin.API.sendEntityHurtAnimation(entity);
} else { } else {

4
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -4010,6 +4010,10 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
ev.setDamage(DamageModifier.BASE,storeddmg-CUSTOM_DAMAGE_IDENTIFIER); ev.setDamage(DamageModifier.BASE,storeddmg-CUSTOM_DAMAGE_IDENTIFIER);
ev.setDamage(storeddmg-CUSTOM_DAMAGE_IDENTIFIER); ev.setDamage(storeddmg-CUSTOM_DAMAGE_IDENTIFIER);
log("New Damage: "+ev.getFinalDamage(),4); log("New Damage: "+ev.getFinalDamage(),4);
if (ev.getEntity() instanceof Monster &&
ev.getDamager() instanceof Player) {
NewCombat.addMonsterToTargetList((Monster)ev.getEntity(), (Player)ev.getDamager());
}
} else { } else {
double dmg = 0.0; double dmg = 0.0;
if (ev.getEntity() instanceof Player) { if (ev.getEntity() instanceof Player) {