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

Added safe zone protection for flame

Browse Source
This commit is contained in:
phobia 2016-02-03 10:39:21 +11:00
parent 59e564cdc6
commit 0e0582a1a7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,7 +263,7 @@ public class ClansGame extends MiniPlugin
{ {
// Cancel // Cancel
event.SetCancelled("Clans Ally"); event.SetCancelled("Clans Ally");
// Inform // Inform
if (damager != null) if (damager != null)
{ {
@ -538,7 +538,7 @@ public class ClansGame extends MiniPlugin
ClanInfo clan = _clans.getClanUtility().getOwner(event.getEntity().getLocation()); ClanInfo clan = _clans.getClanUtility().getOwner(event.getEntity().getLocation());
if (clan == null) return; if (clan == null) return;
if (_clans.getWarManager().isBeingInvaded(clan)) if (_clans.getWarManager().isBeingInvaded(clan))
{ {
// Allow because of invasion // Allow because of invasion

1
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/AttackAttribute.java
View File

@ -30,6 +30,7 @@ public abstract class AttackAttribute extends ItemAttribute
@Override @Override
public void onAttack(CustomDamageEvent event) public void onAttack(CustomDamageEvent event)
{ {
if(event.GetCancellers().contains("Safe Zone")) return;
_attackCount++; _attackCount++;
System.out.println("Attack count " + _attackCount + " - " + _attackLimit); System.out.println("Attack count " + _attackCount + " - " + _attackLimit);
if (_attackCount >= _attackLimit) if (_attackCount >= _attackLimit)