From 3c2e51e8eda8f946ab652321f67acd5466484fb6 Mon Sep 17 00:00:00 2001 From: eueln Date: Wed, 17 Dec 2014 20:50:24 -0600 Subject: [PATCH] Make LandUnclaimAllEvent Cancellable --- .../massivecraft/factions/cmd/CmdUnclaimall.java | 4 +++- .../factions/event/LandUnclaimAllEvent.java | 14 +++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java index d0e2bcce..80005969 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java @@ -44,7 +44,9 @@ public class CmdUnclaimall extends FCommand { LandUnclaimAllEvent unclaimAllEvent = new LandUnclaimAllEvent(myFaction, fme); Bukkit.getServer().getPluginManager().callEvent(unclaimAllEvent); - // this event cannot be cancelled + if (unclaimAllEvent.isCancelled()) { + return; + } Board.getInstance().unclaimAll(myFaction.getId()); myFaction.msg(TL.COMMAND_UNCLAIMALL_UNCLAIMED, fme.describeTo(myFaction, true)); diff --git a/src/main/java/com/massivecraft/factions/event/LandUnclaimAllEvent.java b/src/main/java/com/massivecraft/factions/event/LandUnclaimAllEvent.java index bb82196a..6c52b93b 100644 --- a/src/main/java/com/massivecraft/factions/event/LandUnclaimAllEvent.java +++ b/src/main/java/com/massivecraft/factions/event/LandUnclaimAllEvent.java @@ -3,8 +3,10 @@ package com.massivecraft.factions.event; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Faction; import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; -public class LandUnclaimAllEvent extends FactionPlayerEvent { +public class LandUnclaimAllEvent extends FactionPlayerEvent implements Cancellable { + private boolean cancelled; public LandUnclaimAllEvent(Faction f, FPlayer p) { super(f, p); @@ -45,4 +47,14 @@ public class LandUnclaimAllEvent extends FactionPlayerEvent { public Player getPlayer() { return getfPlayer().getPlayer(); } + + @Override + public boolean isCancelled() { + return cancelled; + } + + @Override + public void setCancelled(boolean cancelled) { + this.cancelled = cancelled; + } }