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

Fixes to buff display system.

Browse Source
This commit is contained in:
sigonasr2 2016-09-05 15:24:55 -05:00
parent 91caf89c04
commit fedf0343aa
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

8
src/sig/plugin/TwosideKeeper/CustomDamage.java
View File

@ -426,14 +426,14 @@ public class CustomDamage {
} }
for (LivingEntity ent : hitlist) { for (LivingEntity ent : hitlist) {
if (applyDeathMark) {
GenericFunctions.ApplyDeathMark(ent);
}
if (!ent.equals(target)) { if (!ent.equals(target)) {
//hitlist.get(i).damage(dmg); //hitlist.get(i).damage(dmg);
//GenericFunctions.DealDamageToMob(CalculateDamageReduction(dmg,target,damager), hitlist.get(i), shooter, weapon, "AoE Damage"); //GenericFunctions.DealDamageToMob(CalculateDamageReduction(dmg,target,damager), hitlist.get(i), shooter, weapon, "AoE Damage");
ApplyDamage(0,damager,ent,weapon,"AoE Damage",setFlag(flags,NOAOE)); ApplyDamage(0,damager,ent,weapon,"AoE Damage",setFlag(flags,NOAOE));
}; };
if (applyDeathMark) {
GenericFunctions.ApplyDeathMark(ent);
}
} }
final List<LivingEntity> finallist = hitlist; final List<LivingEntity> finallist = hitlist;
@ -2121,8 +2121,10 @@ public class CustomDamage {
{ {
if (shooter instanceof Player) { if (shooter instanceof Player) {
Player p = (Player)shooter; Player p = (Player)shooter;
if (PlayerMode.getPlayerMode(p)==PlayerMode.SLAYER) {
p.playSound(p.getLocation(), Sound.ENTITY_SHULKER_TELEPORT, 1f, 3.65f); p.playSound(p.getLocation(), Sound.ENTITY_SHULKER_TELEPORT, 1f, 3.65f);
} }
}
return true; return true;
} else { } else {
return false; return false;

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

@ -116,7 +116,11 @@ public enum PlayerMode {
} }
public static boolean needsUpdating(PlayerStructure pd) { public static boolean needsUpdating(PlayerStructure pd) {
if (pd!=null) {
return pd.lastmodeupdate+UPDATE_GRACE_PERIOD<=TwosideKeeper.getServerTickTime(); return pd.lastmodeupdate+UPDATE_GRACE_PERIOD<=TwosideKeeper.getServerTickTime();
} else {
return false;
}
} }
public static boolean isRanger(Player p) { public static boolean isRanger(Player p) {

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

@ -2624,7 +2624,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
} }
if (reset) { if (reset) {
pd.last_deathmark = getServerTickTime()-GenericFunctions.GetModifiedCooldown(TwosideKeeper.DEATHMARK_COOLDOWN,player)+20; pd.last_deathmark = getServerTickTime()-GenericFunctions.GetModifiedCooldown(TwosideKeeper.DEATHMARK_COOLDOWN,player)+20;
aPlugin.API.sendCooldownPacket(player, player.getEquipment().getItemInMainHand(), 20); aPlugin.API.sendCooldownPacket(player, player.getEquipment().getItemInMainHand(), 10);
} }
} }
} }