summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-01-04 21:37:00 +0000
committerKHobbits <rob@khobbits.co.uk>2012-01-04 21:37:00 +0000
commit8432e1fc7d5a208086a89d19299e8c4cf268c7f5 (patch)
treefe03668cd1893ac1753538734661e95b9591da90
parenta46f6fd73decdc47e5c2bf29c563d0deb20f0735 (diff)
downloadEssentials-8432e1fc7d5a208086a89d19299e8c4cf268c7f5.tar
Essentials-8432e1fc7d5a208086a89d19299e8c4cf268c7f5.tar.gz
Essentials-8432e1fc7d5a208086a89d19299e8c4cf268c7f5.tar.lz
Essentials-8432e1fc7d5a208086a89d19299e8c4cf268c7f5.tar.xz
Essentials-8432e1fc7d5a208086a89d19299e8c4cf268c7f5.zip
Fixing kit and protect signs (inGroup)
Fix imports
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsCommandHandler.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/api/IUser.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandgive.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commanditem.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/user/User.java23
-rw-r--r--Essentials/src/com/earth2me/essentials/user/UserData.java1
8 files changed, 11 insertions, 26 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 1e16eb04a..043556505 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -19,12 +19,8 @@ package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.craftbukkit.ItemDupeFix;
import com.earth2me.essentials.listener.*;
-import com.earth2me.essentials.listener.TNTExplodeListener;
import com.earth2me.essentials.perm.PermissionsHandler;
import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.settings.SettingsHolder;
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsCommandHandler.java b/Essentials/src/com/earth2me/essentials/EssentialsCommandHandler.java
index 71cd44501..5c0fdbafa 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsCommandHandler.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsCommandHandler.java
@@ -2,8 +2,6 @@ package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IEssentialsModule;
import com.earth2me.essentials.commands.EssentialsCommand;
import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.commands.NoChargeException;
diff --git a/Essentials/src/com/earth2me/essentials/api/IUser.java b/Essentials/src/com/earth2me/essentials/api/IUser.java
index 52f936fb7..ea7c8b930 100644
--- a/Essentials/src/com/earth2me/essentials/api/IUser.java
+++ b/Essentials/src/com/earth2me/essentials/api/IUser.java
@@ -40,6 +40,8 @@ public interface IUser extends Player, IStorageObjectHolder<UserData>, IReload,
void payUser(final IUser reciever, final double value) throws Exception;
String getGroup();
+
+ boolean inGroup(String group);
void setLastLocation();
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
index 45fc2f77b..c00a21c49 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java
@@ -1,8 +1,6 @@
package com.earth2me.essentials.commands;
-import com.earth2me.essentials.api.ISettings;
import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import java.util.Locale;
import org.bukkit.ChatColor;
import org.bukkit.Material;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
index 985535dec..1a5b5edb9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java
@@ -1,9 +1,7 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ISettings;
import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import java.util.Locale;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
index 0c6ac8b12..0c86b59ba 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
@@ -3,7 +3,6 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import java.util.List;
import java.util.Locale;
import java.util.Set;
import lombok.Cleanup;
diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/com/earth2me/essentials/user/User.java
index cc461598d..57469151b 100644
--- a/Essentials/src/com/earth2me/essentials/user/User.java
+++ b/Essentials/src/com/earth2me/essentials/user/User.java
@@ -8,27 +8,22 @@ import com.earth2me.essentials.Util;
import com.earth2me.essentials.api.*;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import com.earth2me.essentials.register.payment.Method;
-import java.net.InetSocketAddress;
-import java.util.*;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import lombok.Cleanup;
import lombok.Getter;
import lombok.Setter;
-import org.bukkit.*;
-import org.bukkit.block.Block;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
-import org.bukkit.entity.*;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-import org.bukkit.map.MapView;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.util.Vector;
public class User extends UserBase implements IUser
diff --git a/Essentials/src/com/earth2me/essentials/user/UserData.java b/Essentials/src/com/earth2me/essentials/user/UserData.java
index fd2eb99cc..7a11f5f9d 100644
--- a/Essentials/src/com/earth2me/essentials/user/UserData.java
+++ b/Essentials/src/com/earth2me/essentials/user/UserData.java
@@ -9,7 +9,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.bukkit.Location;
import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
@Data