From a00ca1fd525762d33623e2f8c06bbf35d69ac0b3 Mon Sep 17 00:00:00 2001 From: ementalo Date: Thu, 11 Oct 2012 15:06:25 +0100 Subject: Fix /god Use assigned variable in protect BlockListener Cleanup imports --- Essentials/src/net/ess3/settings/antibuild/BlackList.java | 2 -- Essentials/src/net/ess3/user/User.java | 6 ++++++ .../src/net/ess3/protect/EssentialsProtectBlockListener.java | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Essentials/src/net/ess3/settings/antibuild/BlackList.java b/Essentials/src/net/ess3/settings/antibuild/BlackList.java index 39305859c..1d91af2ae 100644 --- a/Essentials/src/net/ess3/settings/antibuild/BlackList.java +++ b/Essentials/src/net/ess3/settings/antibuild/BlackList.java @@ -1,7 +1,6 @@ package net.ess3.settings.antibuild; import java.util.Arrays; -import java.util.Collections; import java.util.HashSet; import java.util.Set; import lombok.AccessLevel; @@ -9,7 +8,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import net.ess3.settings.WorldOptions; import net.ess3.storage.Comment; import net.ess3.storage.ListType; import net.ess3.storage.StorageObject; diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index a428abc3f..7593b9c6a 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -441,6 +441,12 @@ public class User extends UserBase implements IUser || (getData().isAfk() && settings.getData().getCommands().getAfk().isFreezeAFKPlayers()); } + @Override + public void setGodModeEnabled(boolean set) + { + getData().setGodmode(set); + } + @Override public void updateCompass() { diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java index b77e49177..0cc39069f 100644 --- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java @@ -23,8 +23,8 @@ public class EssentialsProtectBlockListener implements Listener { final ProtectHolder settings = prot.getSettings(); final Block block = event.getBlock(); - if (event.getBlock().getType() == Material.OBSIDIAN - || event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.OBSIDIAN) + if (block.getType() == Material.OBSIDIAN + || block.getRelative(BlockFace.DOWN).getType() == Material.OBSIDIAN) { event.setCancelled(settings.getData().getPrevent().isPortalCreation()); return; -- cgit v1.2.3