From a85b2b9f2d2de1c2fd44bc9e1ac21b1b91c8437b Mon Sep 17 00:00:00 2001 From: Magnus Ulf Date: Sun, 23 Dec 2018 13:59:25 +0100 Subject: [PATCH] This is 3.0.0 snapshot --- pom.xml | 2 +- src/com/massivecraft/factions/engine/EnginePermBuild.java | 2 +- src/com/massivecraft/factions/entity/MPerm.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fe9fa2e9..821e50fd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.massivecraft.massivesuper MassiveSuper - 2.14.1-SNAPSHOT + 3.0.0-SNAPSHOT ../MassiveSuper diff --git a/src/com/massivecraft/factions/engine/EnginePermBuild.java b/src/com/massivecraft/factions/engine/EnginePermBuild.java index 5707224c..98207039 100644 --- a/src/com/massivecraft/factions/engine/EnginePermBuild.java +++ b/src/com/massivecraft/factions/engine/EnginePermBuild.java @@ -34,7 +34,6 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.hanging.HangingPlaceEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent; @@ -87,6 +86,7 @@ public class EnginePermBuild extends Engine { Boolean ret = isProtected(protectCase, verboose, MPlayer.get(senderObject), ps, object); if (Boolean.TRUE.equals(ret) && cancellable != null) cancellable.setCancelled(true); + return ret; } diff --git a/src/com/massivecraft/factions/entity/MPerm.java b/src/com/massivecraft/factions/entity/MPerm.java index 222492ef..70bc40bf 100644 --- a/src/com/massivecraft/factions/entity/MPerm.java +++ b/src/com/massivecraft/factions/entity/MPerm.java @@ -395,7 +395,8 @@ public class MPerm extends Entity implements Prioritized, Registerable, N } } - return this.has(mplayer, hostFaction, verboose); + var ret = this.has(mplayer, hostFaction, verboose); + return ret; } // -------------------------------------------- //