mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-10-17 17:05:20 +02:00
Merge branch 'master' into release
This commit is contained in:
commit
b34119901e
@ -9,7 +9,7 @@ import org.bukkit.plugin.Plugin;
|
||||
public class Permissions2Handler implements IPermissionsHandler
|
||||
{
|
||||
private final transient PermissionHandler permissionHandler;
|
||||
|
||||
|
||||
Permissions2Handler(final Plugin permissionsPlugin)
|
||||
{
|
||||
permissionHandler = ((Permissions)permissionsPlugin).getHandler();
|
||||
@ -37,12 +37,13 @@ public class Permissions2Handler implements IPermissionsHandler
|
||||
|
||||
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)
|
||||
{
|
||||
return permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base));
|
||||
final String suffix = permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base));
|
||||
return suffix == null ? "" : suffix;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -55,7 +55,7 @@ public class Commandunlimited extends EssentialsCommand
|
||||
return;
|
||||
}
|
||||
|
||||
ItemStack stack = ess.getItemDb().get(args[0], 1);
|
||||
ItemStack stack = ess.getItemDb().get(args[0], 2);
|
||||
|
||||
String itemname = stack.getType().toString().toLowerCase().replace("_", "");
|
||||
if (!user.isAuthorized("essentials.unlimited.item-all")
|
||||
|
@ -27,13 +27,11 @@ dist.javadoc.dir=${dist.dir}/javadoc
|
||||
endorsed.classpath=
|
||||
excludes=
|
||||
file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
|
||||
file.reference.Factions.jar=../lib/Factions.jar
|
||||
includes=**
|
||||
jar.compress=false
|
||||
javac.classpath=\
|
||||
${reference.Essentials.jar}:\
|
||||
${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\
|
||||
${file.reference.Factions.jar}
|
||||
${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
|
||||
# Space-separated list of extra javac options
|
||||
javac.compilerargs=
|
||||
javac.deprecation=false
|
||||
|
@ -22,8 +22,7 @@ public class EssentialsChat extends JavaPlugin
|
||||
final PluginManager pluginManager = getServer().getPluginManager();
|
||||
final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials");
|
||||
|
||||
chatListener = new HashMap<String, IEssentialsChatListener>();
|
||||
//EssentialsChatPlayerListener.checkFactions(pluginManager);
|
||||
chatListener = new HashMap<String, IEssentialsChatListener>();
|
||||
|
||||
final EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer(), ess, chatListener);
|
||||
pluginManager.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Highest, this);
|
||||
|
@ -100,7 +100,7 @@ public class EssentialsChatPlayerListener extends PlayerListener
|
||||
{
|
||||
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 int dx = Math.abs(x - l.getBlockX());
|
||||
|
BIN
lib/Factions.jar
BIN
lib/Factions.jar
Binary file not shown.
Loading…
Reference in New Issue
Block a user