JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump listener priority, change wording. Fixes PC-308

This commit is contained in:
samczsun 2016-05-17 21:53:50 -04:00 committed by Sam Sun
parent c172d226c4
commit 41846f835d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java
View File

@ -400,13 +400,13 @@ public class Spawn extends MiniPlugin
if (isInSpawn(victim))
{
event.SetCancelled("Safe Zone");
attemptNotify(attacker, "You cannot attack players who are in spawn!");
attemptNotify(attacker, "You cannot attack players who are in a safe zone!");
return;
}
else if (isInSpawn(attacker) && !isCombatTagged(attacker))
{
event.SetCancelled("Safe Zone");
attemptNotify(attacker, "You cannot attack untagged players while in spawn!");
attemptNotify(attacker, "You cannot attack untagged players while in a safe zone!");
return;
}
}

2
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
View File

@ -529,7 +529,7 @@ public class DamageManager extends MiniPlugin
}
}
@EventHandler
@EventHandler (priority = EventPriority.MONITOR)
public void DamageSound(CustomDamageEvent event)
{
if (event.IsCancelled())