summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <ementalodev@gmx.co.uk>2012-10-11 15:06:25 +0100
committerementalo <ementalodev@gmx.co.uk>2012-10-11 15:06:25 +0100
commita00ca1fd525762d33623e2f8c06bbf35d69ac0b3 (patch)
treeef81e9b20469787733a604ce12ece5995513fd24
parent5e663508ce29dbcb327804a4b75351783d6e74f0 (diff)
downloadEssentials-a00ca1fd525762d33623e2f8c06bbf35d69ac0b3.tar
Essentials-a00ca1fd525762d33623e2f8c06bbf35d69ac0b3.tar.gz
Essentials-a00ca1fd525762d33623e2f8c06bbf35d69ac0b3.tar.lz
Essentials-a00ca1fd525762d33623e2f8c06bbf35d69ac0b3.tar.xz
Essentials-a00ca1fd525762d33623e2f8c06bbf35d69ac0b3.zip
Fix /god
Use assigned variable in protect BlockListener Cleanup imports
-rw-r--r--Essentials/src/net/ess3/settings/antibuild/BlackList.java2
-rw-r--r--Essentials/src/net/ess3/user/User.java6
-rw-r--r--EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java4
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
@@ -442,6 +442,12 @@ public class User extends UserBase implements IUser
}
@Override
+ public void setGodModeEnabled(boolean set)
+ {
+ getData().setGodmode(set);
+ }
+
+ @Override
public void updateCompass()
{
try
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;