Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-17 17:05:20 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into release

Browse Source
This commit is contained in:
snowleo 2011-07-21 02:29:45 +02:00
commit b34119901e
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Essentials/src/com/earth2me/essentials/Permissions2Handler.java
View File

@ -9,7 +9,7 @@ import org.bukkit.plugin.Plugin;
public class Permissions2Handler implements IPermissionsHandler public class Permissions2Handler implements IPermissionsHandler
{ {
private final transient PermissionHandler permissionHandler; private final transient PermissionHandler permissionHandler;
Permissions2Handler(final Plugin permissionsPlugin) Permissions2Handler(final Plugin permissionsPlugin)
{ {
permissionHandler = ((Permissions)permissionsPlugin).getHandler(); permissionHandler = ((Permissions)permissionsPlugin).getHandler();
@ -37,12 +37,13 @@ public class Permissions2Handler implements IPermissionsHandler
public String getPrefix(final Player base) public String getPrefix(final Player base)
{ {
return permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base)); final String prefix = permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base));
return prefix == null ? "" : prefix;
} }
public String getSuffix(final Player base) public String getSuffix(final Player base)
{ {
return permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base)); final String suffix = permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base));
return suffix == null ? "" : suffix;
} }
} }

2
Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java
View File

@ -55,7 +55,7 @@ public class Commandunlimited extends EssentialsCommand
return; return;
} }
ItemStack stack = ess.getItemDb().get(args[0], 1); ItemStack stack = ess.getItemDb().get(args[0], 2);
String itemname = stack.getType().toString().toLowerCase().replace("_", ""); String itemname = stack.getType().toString().toLowerCase().replace("_", "");
if (!user.isAuthorized("essentials.unlimited.item-all") if (!user.isAuthorized("essentials.unlimited.item-all")

4
EssentialsChat/nbproject/project.properties
View File

@ -27,13 +27,11 @@ dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath= endorsed.classpath=
excludes= excludes=
file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
file.reference.Factions.jar=../lib/Factions.jar
includes=** includes=**
jar.compress=false jar.compress=false
javac.classpath=\ javac.classpath=\
${reference.Essentials.jar}:\ ${reference.Essentials.jar}:\
${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
${file.reference.Factions.jar}
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs= javac.compilerargs=
javac.deprecation=false javac.deprecation=false

3
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
View File

@ -22,8 +22,7 @@ public class EssentialsChat extends JavaPlugin
final PluginManager pluginManager = getServer().getPluginManager(); final PluginManager pluginManager = getServer().getPluginManager();
final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials"); final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials");
chatListener = new HashMap<String, IEssentialsChatListener>(); chatListener = new HashMap<String, IEssentialsChatListener>();
//EssentialsChatPlayerListener.checkFactions(pluginManager);
final EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer(), ess, chatListener); final EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer(), ess, chatListener);
pluginManager.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Highest, this); pluginManager.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Highest, this);

2
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java
View File

@ -100,7 +100,7 @@ public class EssentialsChatPlayerListener extends PlayerListener
{ {
continue; continue;
} }
if (u.equals(user) && !u.isAuthorized("essentials.chat.spy")) if (!u.equals(user) && !u.isAuthorized("essentials.chat.spy"))
{ {
final Location l = u.getLocation(); final Location l = u.getLocation();
final int dx = Math.abs(x - l.getBlockX()); final int dx = Math.abs(x - l.getBlockX());

BIN
lib/Factions.jar
View File

Binary file not shown.