minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-18 12:31:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/essentials/Essentials

Browse Source
This commit is contained in:
Iaccidentally
2012-08-26 20:02:37 -04:00
parent d8c6b921f0 53cffa7556
commit f52d7d05ec
43 changed files with 178 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Essentials/src/net/ess3/Essentials.java
View File

@@ -350,4 +350,10 @@ public class Essentials implements IEssentials
{ {
return economy; return economy;
} }
@Override
public void reload()
{
//do something
}
} }

22
Essentials/src/net/ess3/Jails.java
View File

@@ -42,8 +42,8 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
final PluginManager pluginManager = ess.getServer().getPluginManager(); final PluginManager pluginManager = ess.getServer().getPluginManager();
final JailBlockListener blockListener = new JailBlockListener(); final JailBlockListener blockListener = new JailBlockListener();
final JailPlayerListener playerListener = new JailPlayerListener(); final JailPlayerListener playerListener = new JailPlayerListener();
pluginManager.registerEvents(blockListener, ess); pluginManager.registerEvents(blockListener, ess.getPlugin());
pluginManager.registerEvents(playerListener, ess); pluginManager.registerEvents(playerListener, ess.getPlugin());
} }
@Override @Override
@@ -157,6 +157,24 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
} }
} }
@Override
public void finishRead()
{
}
@Override
public void finishWrite()
{
}
@Override
public int getCount()
{
throw new UnsupportedOperationException("Not supported yet.");
}
private class JailBlockListener implements Listener private class JailBlockListener implements Listener
{ {

22
Essentials/src/net/ess3/Teleport.java
View File

@@ -70,10 +70,10 @@ public class Teleport implements Runnable, ITeleport
{ {
this.started = System.currentTimeMillis(); this.started = System.currentTimeMillis();
this.delay = delay; this.delay = delay;
this.health = user.getHealth(); this.health = user.getPlayer().getHealth();
this.initX = Math.round(user.getLocation().getX() * MOVE_CONSTANT); this.initX = Math.round(user.getPlayer().getLocation().getX() * MOVE_CONSTANT);
this.initY = Math.round(user.getLocation().getY() * MOVE_CONSTANT); this.initY = Math.round(user.getPlayer().getLocation().getY() * MOVE_CONSTANT);
this.initZ = Math.round(user.getLocation().getZ() * MOVE_CONSTANT); this.initZ = Math.round(user.getPlayer().getLocation().getZ() * MOVE_CONSTANT);
this.teleportTarget = target; this.teleportTarget = target;
this.chargeFor = chargeFor; this.chargeFor = chargeFor;
this.cause = cause; this.cause = cause;
@@ -83,21 +83,21 @@ public class Teleport implements Runnable, ITeleport
public void run() public void run()
{ {
if (user == null || !user.isOnline() || user.getLocation() == null) if (user == null || !user.isOnline() || user.getPlayer().getLocation() == null)
{ {
cancel(); cancel();
return; return;
} }
if (Math.round(user.getLocation().getX() * MOVE_CONSTANT) != initX if (Math.round(user.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX
|| Math.round(user.getLocation().getY() * MOVE_CONSTANT) != initY || Math.round(user.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY
|| Math.round(user.getLocation().getZ() * MOVE_CONSTANT) != initZ || Math.round(user.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ
|| user.getHealth() < health) || user.getPlayer().getHealth() < health)
{ // user moved, cancel teleport { // user moved, cancel teleport
cancel(true); cancel(true);
return; return;
} }
health = user.getHealth(); // in case user healed, then later gets injured health = user.getPlayer().getHealth(); // in case user healed, then later gets injured
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
if (now > started + delay) if (now > started + delay)
@@ -137,7 +137,7 @@ public class Teleport implements Runnable, ITeleport
public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
{ {
final Location bed = user.getBedSpawnLocation(); final Location bed = user.getBedSpawnLocation();
final Location respawnLoc = ess.getPlugin().callRespawnEvent(user, bed == null ? user.getWorld().getSpawnLocation() : bed, bed != null); final Location respawnLoc = ess.getPlugin().callRespawnEvent(user.getPlayer(), bed == null ? user.getPlayer().getWorld().getSpawnLocation() : bed, bed != null);
teleport(new Target(respawnLoc), chargeFor, cause); teleport(new Target(respawnLoc), chargeFor, cause);
} }

2
Essentials/src/net/ess3/api/IEssentials.java
View File

@@ -46,7 +46,7 @@ public interface IEssentials extends IComponent
//int scheduleSyncDelayedTask(Runnable run, long delay); //int scheduleSyncDelayedTask(Runnable run, long delay);
//int scheduleSyncRepeatingTask(Runnable run, long delay, long period); //int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
//IPermissionsHandler getPermissionsHandler(); //IPermissionsHandler getPermissionsHandler();
//void reload(); void reload();
void setRanks(IRanks groups); void setRanks(IRanks groups);

2
Essentials/src/net/ess3/commands/Commandeco.java
View File

@@ -61,7 +61,7 @@ public class Commandeco extends EssentialsCommand
{ {
for (Player onlinePlayer : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {
final IUser player = onlinePlayer.getUser(); final IUser player = ess.getUserMap().getUser(onlinePlayer);
switch (cmd) switch (cmd)
{ {
case GIVE: case GIVE:

6
Essentials/src/net/ess3/commands/Commandenchant.java
View File

@@ -19,7 +19,7 @@ public class Commandenchant extends EssentialsCommand
@Override @Override
protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{ {
final ItemStack stack = user.getItemInHand(); final ItemStack stack = user.getPlayer().getItemInHand();
if (stack == null) if (stack == null)
{ {
throw new Exception(_("nothingInHand")); throw new Exception(_("nothingInHand"));
@@ -63,8 +63,8 @@ public class Commandenchant extends EssentialsCommand
{ {
stack.addEnchantment(enchantment, level); stack.addEnchantment(enchantment, level);
} }
user.getInventory().setItemInHand(stack); user.getPlayer().getInventory().setItemInHand(stack);
user.updateInventory(); user.getPlayer().updateInventory();
final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
if (level == 0) if (level == 0)
{ {

12
Essentials/src/net/ess3/commands/Commandexp.java
View File

@@ -114,9 +114,9 @@ public class Commandexp extends EssentialsCommand
private void showExp(final CommandSender sender, final IUser target) private void showExp(final CommandSender sender, final IUser target)
{ {
final int totalExp = SetExpFix.getTotalExperience(target); final int totalExp = SetExpFix.getTotalExperience(target.getPlayer());
final int expLeft = (int)Util.roundDouble(((((3.5 * target.getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getLevel() * target.getLevel())) + (5.00 * target.getLevel())))) + 1)); final int expLeft = (int)Util.roundDouble(((((3.5 * target.getPlayer().getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getPlayer().getLevel() * target.getPlayer().getLevel())) + (5.00 * target.getPlayer().getLevel())))) + 1));
sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), expLeft)); sender.sendMessage(_("exp", target.getPlayer().getDisplayName(), SetExpFix.getTotalExperience(target.getPlayer()), target.getPlayer().getLevel(), expLeft));
} }
private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give) private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give)
@@ -124,13 +124,13 @@ public class Commandexp extends EssentialsCommand
Long amount = Long.parseLong(strAmount); Long amount = Long.parseLong(strAmount);
if (give) if (give)
{ {
amount += SetExpFix.getTotalExperience(target); amount += SetExpFix.getTotalExperience(target.getPlayer());
} }
if (amount > Integer.MAX_VALUE) if (amount > Integer.MAX_VALUE)
{ {
amount = (long)Integer.MAX_VALUE; amount = (long)Integer.MAX_VALUE;
} }
SetExpFix.setTotalExperience(target, amount.intValue()); SetExpFix.setTotalExperience(target.getPlayer(), amount.intValue());
sender.sendMessage(_("expSet", target.getDisplayName(), amount)); sender.sendMessage(_("expSet", target.getPlayer().getDisplayName(), amount));
} }
} }

10
Essentials/src/net/ess3/commands/Commandinvsee.java
View File

@@ -26,17 +26,17 @@ public class Commandinvsee extends EssentialsCommand
user.acquireWriteLock(); user.acquireWriteLock();
if (invUser == user && user.getData().getInventory() != null) if (invUser == user && user.getData().getInventory() != null)
{ {
invUser.getInventory().setContents(user.getData().getInventory().getBukkitInventory()); invUser.getPlayer().getInventory().setContents(user.getData().getInventory().getBukkitInventory());
user.getData().setInventory(null); user.getData().setInventory(null);
user.sendMessage(_("invRestored")); user.sendMessage(_("invRestored"));
throw new NoChargeException(); throw new NoChargeException();
} }
if (user.getData().getInventory() == null) if (user.getData().getInventory() == null)
{ {
user.getData().setInventory(new Inventory(user.getInventory().getContents())); user.getData().setInventory(new Inventory(user.getPlayer().getInventory().getContents()));
} }
ItemStack[] invUserStack = invUser.getInventory().getContents(); ItemStack[] invUserStack = invUser.getPlayer().getInventory().getContents();
final int userStackLength = user.getInventory().getContents().length; final int userStackLength = user.getPlayer().getInventory().getContents().length;
if (invUserStack.length < userStackLength) if (invUserStack.length < userStackLength)
{ {
invUserStack = Arrays.copyOf(invUserStack, userStackLength); invUserStack = Arrays.copyOf(invUserStack, userStackLength);
@@ -45,7 +45,7 @@ public class Commandinvsee extends EssentialsCommand
{ {
throw new Exception(_("invBigger")); throw new Exception(_("invBigger"));
} }
user.getInventory().setContents(invUserStack); user.getPlayer().getInventory().setContents(invUserStack);
user.sendMessage(_("invSee", invUser.getPlayer().getDisplayName())); user.sendMessage(_("invSee", invUser.getPlayer().getDisplayName()));
user.sendMessage(_("invSeeHelp")); user.sendMessage(_("invSeeHelp"));
throw new NoChargeException(); throw new NoChargeException();

6
Essentials/src/net/ess3/commands/Commandpay.java
View File

@@ -25,10 +25,10 @@ public class Commandpay extends EssentialsCommand
double amount = Double.parseDouble(args[1].replaceAll("[^0-9\\.]", "")); double amount = Double.parseDouble(args[1].replaceAll("[^0-9\\.]", ""));
boolean foundUser = false; boolean foundUser = false;
for (Player p : ess.getUserMap().matchUsers(args[0], false, true)) for (IUser u : ess.getUserMap().matchUsers(args[0], false, true))
{ {
user.payUser(p.getUser(), amount); user.payUser(u, amount);
Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), p.getName(), new Trade(amount, ess), user.getLocation(), ess); Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), u.getName(), new Trade(amount, ess), user.getPlayer().getLocation(), ess);
foundUser = true; foundUser = true;
} }

2
Essentials/src/net/ess3/commands/Commandpowertool.java
View File

@@ -27,7 +27,7 @@ public class Commandpowertool extends EssentialsCommand
return; return;
} }
final ItemStack itemStack = user.getItemInHand(); final ItemStack itemStack = user.getPlayer().getItemInHand();
if (itemStack == null || itemStack.getType() == Material.AIR) if (itemStack == null || itemStack.getType() == Material.AIR)
{ {
throw new Exception(_("powerToolAir")); throw new Exception(_("powerToolAir"));

14
Essentials/src/net/ess3/commands/Commandptime.java
View File

@@ -94,14 +94,14 @@ public class Commandptime extends EssentialsCommand
for (IUser user : users) for (IUser user : users)
{ {
if (user.getPlayerTimeOffset() == 0) if (user.getPlayer().getPlayerTimeOffset() == 0)
{ {
sender.sendMessage(_("pTimeNormal", user.getName())); sender.sendMessage(_("pTimeNormal", user.getName()));
} }
else else
{ {
String time = DescParseTickFormat.format(user.getPlayerTime()); String time = DescParseTickFormat.format(user.getPlayer().getPlayerTime());
if (!user.isPlayerTimeRelative()) if (!user.getPlayer().isPlayerTimeRelative())
{ {
sender.sendMessage(_("pTimeCurrentFixed", user.getName(), time)); sender.sendMessage(_("pTimeCurrentFixed", user.getName(), time));
} }
@@ -124,7 +124,7 @@ public class Commandptime extends EssentialsCommand
// Reset // Reset
for (IUser user : users) for (IUser user : users)
{ {
user.resetPlayerTime(); user.getPlayer().resetPlayerTime();
} }
} }
else else
@@ -132,15 +132,15 @@ public class Commandptime extends EssentialsCommand
// Set // Set
for (IUser user : users) for (IUser user : users)
{ {
final World world = user.getWorld(); final World world = user.getPlayer().getWorld();
long time = user.getPlayerTime(); long time = user.getPlayer().getPlayerTime();
time -= time % 24000; time -= time % 24000;
time += 24000 + ticks; time += 24000 + ticks;
if (relative) if (relative)
{ {
time -= world.getTime(); time -= world.getTime();
} }
user.setPlayerTime(time, relative); user.getPlayer().setPlayerTime(time, relative);
} }
} }

2
Essentials/src/net/ess3/commands/Commandr.java
View File

@@ -36,7 +36,7 @@ public class Commandr extends EssentialsCommand
message = Util.replaceFormat(message); message = Util.replaceFormat(message);
} }
replyTo = user; replyTo = user;
senderName = user.getDisplayName(); senderName = user.getPlayer().getDisplayName();
} }
else else
{ {

4
Essentials/src/net/ess3/commands/Commandrealname.java
View File

@@ -30,7 +30,7 @@ public class Commandrealname extends EssentialsCommand
continue; continue;
} }
u.setDisplayNick(); u.setDisplayNick();
final String displayName = Util.stripFormat(u.getDisplayName()).toLowerCase(Locale.ENGLISH); final String displayName = Util.stripFormat(u.getPlayer().getDisplayName()).toLowerCase(Locale.ENGLISH);
settings.acquireReadLock(); settings.acquireReadLock();
if (!whois.equals(displayName) if (!whois.equals(displayName)
&& !displayName.equals(Util.stripFormat(settings.getData().getChat().getNicknamePrefix()) + whois) && !displayName.equals(Util.stripFormat(settings.getData().getChat().getNicknamePrefix()) + whois)
@@ -38,7 +38,7 @@ public class Commandrealname extends EssentialsCommand
{ {
continue; continue;
} }
sender.sendMessage(u.getDisplayName() + " " + _("is") + " " + u.getName()); sender.sendMessage(u.getPlayer().getDisplayName() + " " + _("is") + " " + u.getName());
} }
} }
} }

2
Essentials/src/net/ess3/commands/Commandremove.java
View File

@@ -29,7 +29,7 @@ public class Commandremove extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
ToRemove toRemove; ToRemove toRemove;
final World world = user.getWorld(); final World world = user.getPlayer().getWorld();
int radius = 0; int radius = 0;
if (args.length < 2) if (args.length < 2)

6
Essentials/src/net/ess3/commands/Commandrepair.java
View File

@@ -25,7 +25,7 @@ public class Commandrepair extends EssentialsCommand
if (args[0].equalsIgnoreCase("hand")) if (args[0].equalsIgnoreCase("hand"))
{ {
final ItemStack item = user.getItemInHand(); final ItemStack item = user.getPlayer().getItemInHand();
if (item == null) if (item == null)
{ {
throw new Exception(_("repairInvalidType")); throw new Exception(_("repairInvalidType"));
@@ -53,11 +53,11 @@ public class Commandrepair extends EssentialsCommand
final Trade charge = new Trade("repair-all", ess); final Trade charge = new Trade("repair-all", ess);
charge.isAffordableFor(user); charge.isAffordableFor(user);
final List<String> repaired = new ArrayList<String>(); final List<String> repaired = new ArrayList<String>();
repairItems(user.getInventory().getContents(), user, repaired); repairItems(user.getPlayer().getInventory().getContents(), user, repaired);
if (Permissions.REPAIR_ARMOR.isAuthorized(user)) if (Permissions.REPAIR_ARMOR.isAuthorized(user))
{ {
repairItems(user.getInventory().getArmorContents(), user, repaired); repairItems(user.getPlayer().getInventory().getArmorContents(), user, repaired);
} }
if (repaired.isEmpty()) if (repaired.isEmpty())

7
Essentials/src/net/ess3/commands/Commandseen.java
View File

@@ -4,6 +4,7 @@ import lombok.Cleanup;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import net.ess3.user.PlayerNotFoundException;
import net.ess3.user.UserData.TimestampType; import net.ess3.user.UserData.TimestampType;
import net.ess3.utils.DateUtil; import net.ess3.utils.DateUtil;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -31,9 +32,9 @@ public class Commandseen extends EssentialsCommand
try try
{ {
IUser u = ess.getUserMap().matchUser(args[0], false, false); IUser u = ess.getUserMap().matchUser(args[0], false, false);
sender.sendMessage(_("seenOnline", u.getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN)))); sender.sendMessage(_("seenOnline", u.getPlayer().getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN))));
} }
catch (NoSuchFieldException e) catch (PlayerNotFoundException e)
{ {
@Cleanup @Cleanup
IUser u = ess.getUserMap().getUser(args[0]); IUser u = ess.getUserMap().getUser(args[0]);
@@ -42,7 +43,7 @@ public class Commandseen extends EssentialsCommand
{ {
throw new Exception(_("playerNotFound")); throw new Exception(_("playerNotFound"));
} }
sender.sendMessage(_("seenOffline", u.getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGOUT)))); sender.sendMessage(_("seenOffline", u.getPlayer().getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGOUT))));
if (u.isBanned()) if (u.isBanned())
{ {
sender.sendMessage(_("whoisBanned", show ? u.getData().getBan().getReason() : _("true"))); sender.sendMessage(_("whoisBanned", show ? u.getData().getBan().getReason() : _("true")));

16
Essentials/src/net/ess3/commands/Commandsell.java
View File

@@ -24,11 +24,11 @@ public class Commandsell extends EssentialsCommand
ItemStack is = null; ItemStack is = null;
if (args[0].equalsIgnoreCase("hand")) if (args[0].equalsIgnoreCase("hand"))
{ {
is = user.getItemInHand(); is = user.getPlayer().getItemInHand();
} }
else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all")) else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all"))
{ {
for (ItemStack stack : user.getInventory().getContents()) for (ItemStack stack : user.getPlayer().getInventory().getContents())
{ {
if (stack == null || stack.getType() == Material.AIR) if (stack == null || stack.getType() == Material.AIR)
{ {
@@ -46,7 +46,7 @@ public class Commandsell extends EssentialsCommand
} }
else if (args[0].equalsIgnoreCase("blocks")) else if (args[0].equalsIgnoreCase("blocks"))
{ {
for (ItemStack stack : user.getInventory().getContents()) for (ItemStack stack : user.getPlayer().getInventory().getContents())
{ {
if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR) if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR)
{ {
@@ -95,7 +95,7 @@ public class Commandsell extends EssentialsCommand
int max = 0; int max = 0;
for (ItemStack s : user.getInventory().getContents()) for (ItemStack s : user.getPlayer().getInventory().getContents())
{ {
if (s == null) if (s == null)
{ {
@@ -142,12 +142,12 @@ public class Commandsell extends EssentialsCommand
//TODO: Prices for Enchantments //TODO: Prices for Enchantments
final ItemStack ris = is.clone(); final ItemStack ris = is.clone();
ris.setAmount(amount); ris.setAmount(amount);
InventoryWorkaround.removeItem(user.getInventory(), true, true, ris); InventoryWorkaround.removeItem(user.getPlayer().getInventory(), true, true, ris);
user.updateInventory(); user.getPlayer().updateInventory();
Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(worth * amount, ess), user.getLocation(), ess); Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(worth * amount, ess), user.getPlayer().getLocation(), ess);
user.giveMoney(worth * amount); user.giveMoney(worth * amount);
user.sendMessage(_("itemSold", Util.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), Util.displayCurrency(worth, ess))); user.sendMessage(_("itemSold", Util.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), Util.displayCurrency(worth, ess)));
logger.log(Level.INFO, _("itemSoldConsole", user.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), Util.displayCurrency(worth * amount, ess), amount, Util.displayCurrency(worth, ess))); logger.log(Level.INFO, _("itemSoldConsole", user.getPlayer().getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), Util.displayCurrency(worth * amount, ess), amount, Util.displayCurrency(worth, ess)));
} }
} }

8
Essentials/src/net/ess3/commands/Commandsethome.java
View File

@@ -38,7 +38,7 @@ public class Commandsethome extends EssentialsCommand
{ {
user.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>()); user.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>());
} }
user.getData().getHomes().put(args[0].toLowerCase(Locale.ENGLISH), new net.ess3.storage.StoredLocation(user.getLocation())); user.getData().getHomes().put(args[0].toLowerCase(Locale.ENGLISH), new net.ess3.storage.StoredLocation(user.getPlayer().getLocation()));
} }
else else
{ {
@@ -76,7 +76,7 @@ public class Commandsethome extends EssentialsCommand
{ {
usersHome.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>()); usersHome.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>());
} }
usersHome.getData().getHomes().put(name, new net.ess3.storage.StoredLocation(user.getLocation())); usersHome.getData().getHomes().put(name, new net.ess3.storage.StoredLocation(user.getPlayer().getLocation()));
} }
} }
} }
@@ -87,9 +87,9 @@ public class Commandsethome extends EssentialsCommand
{ {
user.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>()); user.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>());
} }
user.getData().getHomes().put("home", new net.ess3.storage.StoredLocation(user.getLocation())); user.getData().getHomes().put("home", new net.ess3.storage.StoredLocation(user.getPlayer().getLocation()));
} }
user.sendMessage(_("homeSet", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ())); user.sendMessage(_("homeSet", user.getPlayer().getLocation().getWorld().getName(), user.getPlayer().getLocation().getBlockX(), user.getPlayer().getLocation().getBlockY(), user.getPlayer().getLocation().getBlockZ()));
} }
} }

2
Essentials/src/net/ess3/commands/Commandsetjail.java
View File

@@ -14,7 +14,7 @@ public class Commandsetjail extends EssentialsCommand
{ {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
ess.getJails().setJail(args[0], user.getLocation()); ess.getJails().setJail(args[0], user.getPlayer().getLocation());
user.sendMessage(_("jailSet", Util.sanitizeString(args[0]))); user.sendMessage(_("jailSet", Util.sanitizeString(args[0])));
} }

2
Essentials/src/net/ess3/commands/Commandsetspawn.java
View File

@@ -11,7 +11,7 @@ public class Commandsetspawn extends EssentialsCommand
public void run(final IUser user, final String commandLabel, final String[] args) throws Exception public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{ {
final String group = args.length > 0 ? getFinalArg(args, 0) : "default"; final String group = args.length > 0 ? getFinalArg(args, 0) : "default";
((SpawnsHolder)module).setSpawn(user.getLocation(), group); ((SpawnsHolder)module).setSpawn(user.getPlayer().getLocation(), group);
user.sendMessage(_("spawnSet", group)); user.sendMessage(_("spawnSet", group));
} }
} }

2
Essentials/src/net/ess3/commands/Commandsetwarp.java
View File

@@ -24,7 +24,7 @@ public class Commandsetwarp extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
final Location loc = user.getLocation(); final Location loc = user.getPlayer().getLocation();
final IWarps warps = ess.getWarps(); final IWarps warps = ess.getWarps();
Location warpLoc = null; Location warpLoc = null;

2
Essentials/src/net/ess3/commands/Commandsetworth.java
View File

@@ -22,7 +22,7 @@ public class Commandsetworth extends EssentialsCommand
if (args.length == 1) if (args.length == 1)
{ {
stack = user.getInventory().getItemInHand(); stack = user.getPlayer().getInventory().getItemInHand();
price = args[0]; price = args[0];
} }
else else

4
Essentials/src/net/ess3/commands/Commandspawn.java
View File

@@ -23,7 +23,7 @@ public class Commandspawn extends EssentialsCommand
respawn(otherUser, null); respawn(otherUser, null);
if (!otherUser.equals(user)) if (!otherUser.equals(user))
{ {
otherUser.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn")); otherUser.sendMessage(_("teleportAtoB", user.getPlayer().getDisplayName(), "spawn"));
user.sendMessage(_("teleporting")); user.sendMessage(_("teleporting"));
} }
} }
@@ -42,7 +42,7 @@ public class Commandspawn extends EssentialsCommand
} }
final IUser user = ess.getUserMap().matchUser(args[0], false, false); final IUser user = ess.getUserMap().matchUser(args[0], false, false);
respawn(user, null); respawn(user, null);
user.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn")); user.sendMessage(_("teleportAtoB", user.getPlayer().getDisplayName(), "spawn"));
sender.sendMessage(_("teleporting")); sender.sendMessage(_("teleporting"));
} }

19
Essentials/src/net/ess3/commands/Commandspawnmob.java
View File

@@ -244,7 +244,7 @@ public class Commandspawnmob extends EssentialsCommand
{ {
final Tameable tameable = ((Tameable)spawned); final Tameable tameable = ((Tameable)spawned);
tameable.setTamed(true); tameable.setTamed(true);
tameable.setOwner(user.getBase()); tameable.setOwner(user.getPlayer());
} }
if (type == EntityType.WOLF if (type == EntityType.WOLF
&& data.contains("angry")) && data.contains("angry"))
@@ -279,21 +279,6 @@ public class Commandspawnmob extends EssentialsCommand
((Villager)spawned).setProfession(prof); ((Villager)spawned).setProfession(prof);
} }
} }
} }
if (type == EntityType.OCELOT)
{
if (data.contains("siamese"))
{
((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT);
}
if (data.contains("red"))
{
((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT);
}
if (data.contains("black"))
{
((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT);
}
}
} }
} }

5
Essentials/src/net/ess3/commands/Commandsudo.java
View File

@@ -4,6 +4,7 @@ import static net.ess3.I18n._;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
public class Commandsudo extends EssentialsCommand public class Commandsudo extends EssentialsCommand
@@ -29,13 +30,13 @@ public class Commandsudo extends EssentialsCommand
throw new Exception(_("sudoExempt")); throw new Exception(_("sudoExempt"));
} }
sender.sendMessage(_("sudoRun", user.getDisplayName(), command, getFinalArg(arguments, 0))); sender.sendMessage(_("sudoRun", user.getPlayer().getDisplayName(), command, getFinalArg(arguments, 0)));
ess.getServer().dispatchCommand(user, command); ess.getServer().dispatchCommand(user, command);
final PluginCommand execCommand = ess.getServer().getPluginCommand(command); final PluginCommand execCommand = ess.getServer().getPluginCommand(command);
if (execCommand != null) if (execCommand != null)
{ {
execCommand.execute(user.getBase(), command, arguments); execCommand.execute(user.getPlayer(), command, arguments);
} }
} }

6
Essentials/src/net/ess3/commands/Commandsuicide.java
View File

@@ -9,10 +9,10 @@ public class Commandsuicide extends EssentialsCommand
@Override @Override
public void run(final IUser user, final String commandLabel, final String[] args) throws Exception public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{ {
ess.getPlugin().callSuicideEvent(user.getBase()); ess.getPlugin().callSuicideEvent(user.getPlayer());
user.damage(Short.MAX_VALUE); user.getPlayer().damage(Short.MAX_VALUE);
user.sendMessage(_("suicideMessage")); user.sendMessage(_("suicideMessage"));
user.setDisplayNick(); user.setDisplayNick();
ess.broadcastMessage(user,_("suicideSuccess", user.getDisplayName())); ess.broadcastMessage(user,_("suicideSuccess", user.getPlayer().getDisplayName()));
} }
} }

2
Essentials/src/net/ess3/commands/Commandtempban.java
View File

@@ -45,7 +45,7 @@ public class Commandtempban extends EssentialsCommand
user.getData().getBan().setReason(banReason); user.getData().getBan().setReason(banReason);
user.getData().getBan().setTimeout(banTimestamp); user.getData().getBan().setTimeout(banTimestamp);
user.setBanned(true); user.setBanned(true);
user.kickPlayer(banReason); user.getPlayer().kickPlayer(banReason);
final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME; final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
for (Player onlinePlayer : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())

2
Essentials/src/net/ess3/commands/Commandthunder.java
View File

@@ -15,7 +15,7 @@ public class Commandthunder extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
final World world = user.getWorld(); final World world = user.getPlayer().getWorld();
final boolean setThunder = args[0].equalsIgnoreCase("true"); final boolean setThunder = args[0].equalsIgnoreCase("true");
if (args.length > 1) if (args.length > 1)
{ {

2
Essentials/src/net/ess3/commands/Commandtime.java
View File

@@ -129,7 +129,7 @@ public class Commandtime extends EssentialsCommand
} }
else else
{ {
worlds.add(user.getWorld()); worlds.add(user.getPlayer().getWorld());
} }
return worlds; return worlds;
} }

8
Essentials/src/net/ess3/commands/Commandtop.java
View File

@@ -12,10 +12,10 @@ public class Commandtop extends EssentialsCommand
@Override @Override
public void run(final IUser user, final String commandLabel, final String[] args) throws Exception public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{ {
final int topX = user.getLocation().getBlockX(); final int topX = user.getPlayer().getLocation().getBlockX();
final int topZ = user.getLocation().getBlockZ(); final int topZ = user.getPlayer().getLocation().getBlockZ();
final int topY = user.getWorld().getHighestBlockYAt(topX, topZ); final int topY = user.getPlayer().getWorld().getHighestBlockYAt(topX, topZ);
user.getTeleport().teleport(new Location(user.getWorld(), user.getLocation().getX(), topY + 1, user.getLocation().getZ(), user.getLocation().getYaw(), user.getLocation().getPitch()), new Trade(commandName, ess), TeleportCause.COMMAND); user.getTeleport().teleport(new Location(user.getPlayer().getWorld(), user.getPlayer().getLocation().getX(), topY + 1, user.getPlayer().getLocation().getZ(), user.getPlayer().getLocation().getYaw(), user.getPlayer().getLocation().getPitch()), new Trade(commandName, ess), TeleportCause.COMMAND);
user.sendMessage(_("teleportTop")); user.sendMessage(_("teleportTop"));
} }
} }

32
Essentials/src/net/ess3/commands/Commandtp.java
View File

@@ -31,17 +31,17 @@ public class Commandtp extends EssentialsCommand
player.acquireReadLock(); player.acquireReadLock();
if (!player.getData().isTeleportEnabled()) if (!player.getData().isTeleportEnabled())
{ {
throw new Exception(_("teleportDisabled", player.getDisplayName())); throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
} }
if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
&& !WorldPermissions.getPermission(player.getWorld().getName()).isAuthorized(user)) && !WorldPermissions.getPermission(player.getPlayer().getWorld().getName()).isAuthorized(user))
{ {
throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName())); throw new Exception(_("noPerm", "essentials.world." + player.getPlayer().getWorld().getName()));
} }
user.sendMessage(_("teleporting")); user.sendMessage(_("teleporting"));
final Trade charge = new Trade(commandName, ess); final Trade charge = new Trade(commandName, ess);
charge.isAffordableFor(user); charge.isAffordableFor(user);
user.getTeleport().teleport(player, charge, TeleportCause.COMMAND); user.getTeleport().teleport(player.getPlayer(), charge, TeleportCause.COMMAND);
throw new NoChargeException(); throw new NoChargeException();
default: default:
@@ -59,19 +59,19 @@ public class Commandtp extends EssentialsCommand
if (!target.getData().isTeleportEnabled()) if (!target.getData().isTeleportEnabled())
{ {
throw new Exception(_("teleportDisabled", target.getDisplayName())); throw new Exception(_("teleportDisabled", target.getPlayer().getDisplayName()));
} }
if (!toPlayer.getData().isTeleportEnabled()) if (!toPlayer.getData().isTeleportEnabled())
{ {
throw new Exception(_("teleportDisabled", toPlayer.getDisplayName())); throw new Exception(_("teleportDisabled", toPlayer.getPlayer().getDisplayName()));
} }
if (target.getWorld() != toPlayer.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() if (target.getPlayer().getWorld() != toPlayer.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
&& !WorldPermissions.getPermission(toPlayer.getWorld().getName()).isAuthorized(user)) && !WorldPermissions.getPermission(toPlayer.getPlayer().getWorld().getName()).isAuthorized(user))
{ {
throw new Exception(_("noPerm", "essentials.world." + toPlayer.getWorld().getName())); throw new Exception(_("noPerm", "essentials.world." + toPlayer.getPlayer().getWorld().getName()));
} }
target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND); target.getTeleport().now(toPlayer.getPlayer(), false, TeleportCause.COMMAND);
target.sendMessage(_("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName())); target.sendMessage(_("teleportAtoB", user.getPlayer().getDisplayName(), toPlayer.getPlayer().getDisplayName()));
break; break;
} }
} }
@@ -85,9 +85,9 @@ public class Commandtp extends EssentialsCommand
} }
sender.sendMessage(_("teleporting")); sender.sendMessage(_("teleporting"));
final IUser target = getPlayer(args, 0); final IUser target = ess.getUserMap().getUser(args[0]);
final IUser toPlayer = getPlayer(args, 1); final IUser toPlayer =ess.getUserMap().getUser(args[1]);
target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND); target.getTeleport().now(toPlayer.getPlayer(), false, TeleportCause.COMMAND);
target.sendMessage(_("teleportAtoB", Console.NAME, toPlayer.getDisplayName())); target.sendMessage(_("teleportAtoB", Console.NAME, toPlayer.getPlayer().getDisplayName()));
} }
} }

12
Essentials/src/net/ess3/commands/Commandtpa.java
View File

@@ -22,20 +22,20 @@ public class Commandtpa extends EssentialsCommand
player.acquireReadLock(); player.acquireReadLock();
if (!player.getData().isTeleportEnabled()) if (!player.getData().isTeleportEnabled())
{ {
throw new Exception(_("teleportDisabled", player.getDisplayName())); throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
} }
@Cleanup @Cleanup
ISettings settings = ess.getSettings(); ISettings settings = ess.getSettings();
settings.acquireReadLock(); settings.acquireReadLock();
if (user.getWorld() != player.getWorld() && ess.getSettings().getData().getGeneral().isWorldTeleportPermissions() if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && ess.getSettings().getData().getGeneral().isWorldTeleportPermissions()
&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user)) && !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
{ {
throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName())); throw new Exception(_("noPerm", "essentials.world." + player.getPlayer().getWorld().getName()));
} }
if (!player.isIgnoringPlayer(user)) if (!player.isIgnoringPlayer(user))
{ {
player.requestTeleport(user, false); player.requestTeleport(user, false);
player.sendMessage(_("teleportRequest", user.getDisplayName())); player.sendMessage(_("teleportRequest", user.getPlayer().getDisplayName()));
player.sendMessage(_("typeTpaccept")); player.sendMessage(_("typeTpaccept"));
player.sendMessage(_("typeTpdeny")); player.sendMessage(_("typeTpdeny"));
int tpaAcceptCancellation = 0; int tpaAcceptCancellation = 0;
@@ -45,6 +45,6 @@ public class Commandtpa extends EssentialsCommand
player.sendMessage(_("teleportRequestTimeoutInfo", tpaAcceptCancellation)); player.sendMessage(_("teleportRequestTimeoutInfo", tpaAcceptCancellation));
} }
} }
user.sendMessage(_("requestSent", player.getDisplayName())); user.sendMessage(_("requestSent", player.getPlayer().getDisplayName()));
} }
} }

6
Essentials/src/net/ess3/commands/Commandtpaall.java
View File

@@ -47,15 +47,15 @@ public class Commandtpaall extends EssentialsCommand
@Cleanup @Cleanup
ISettings settings = ess.getSettings(); ISettings settings = ess.getSettings();
settings.acquireReadLock(); settings.acquireReadLock();
if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user)) && !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
{ {
continue; continue;
} }
try try
{ {
player.requestTeleport(user, true); player.requestTeleport(user, true);
player.sendMessage(_("teleportHereRequest", user.getDisplayName())); player.sendMessage(_("teleportHereRequest", user.getPlayer().getDisplayName()));
player.sendMessage(_("typeTpaccept")); player.sendMessage(_("typeTpaccept"));
int tpaAcceptCancellation = 0; int tpaAcceptCancellation = 0;
tpaAcceptCancellation = settings.getData().getCommands().getTpa().getTimeout(); tpaAcceptCancellation = settings.getData().getCommands().getTpa().getTimeout();

2
Essentials/src/net/ess3/commands/Commandtpaccept.java
View File

@@ -60,7 +60,7 @@ public class Commandtpaccept extends EssentialsCommand
charge.isAffordableFor(target); charge.isAffordableFor(target);
} }
user.sendMessage(_("requestAccepted")); user.sendMessage(_("requestAccepted"));
target.sendMessage(_("requestAcceptedFrom", user.getDisplayName())); target.sendMessage(_("requestAcceptedFrom", user.getPlayer().getDisplayName()));
if (user.isTeleportRequestHere()) if (user.isTeleportRequestHere())
{ {

12
Essentials/src/net/ess3/commands/Commandtpahere.java
View File

@@ -22,18 +22,18 @@ public class Commandtpahere extends EssentialsCommand
player.acquireReadLock(); player.acquireReadLock();
if (!player.getData().isTeleportEnabled()) if (!player.getData().isTeleportEnabled())
{ {
throw new Exception(_("teleportDisabled", player.getDisplayName())); throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
} }
@Cleanup @Cleanup
ISettings settings = ess.getSettings(); ISettings settings = ess.getSettings();
settings.acquireReadLock(); settings.acquireReadLock();
if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user)) && !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
{ {
throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName())); throw new Exception(_("noPerm", "essentials.world." + user.getPlayer().getWorld().getName()));
} }
player.requestTeleport(user, true); player.requestTeleport(user, true);
player.sendMessage(_("teleportHereRequest", user.getDisplayName())); player.sendMessage(_("teleportHereRequest", user.getPlayer().getDisplayName()));
player.sendMessage(_("typeTpaccept")); player.sendMessage(_("typeTpaccept"));
int tpaAcceptCancellation = 0; int tpaAcceptCancellation = 0;
{ {
@@ -43,6 +43,6 @@ public class Commandtpahere extends EssentialsCommand
{ {
player.sendMessage(_("teleportRequestTimeoutInfo", tpaAcceptCancellation)); player.sendMessage(_("teleportRequestTimeoutInfo", tpaAcceptCancellation));
} }
user.sendMessage(_("requestSent", player.getDisplayName())); user.sendMessage(_("requestSent", player.getPlayer().getDisplayName()));
} }
} }

6
Essentials/src/net/ess3/commands/Commandtpall.java
View File

@@ -43,14 +43,14 @@ public class Commandtpall extends EssentialsCommand
ISettings settings = ess.getSettings(); ISettings settings = ess.getSettings();
settings.acquireReadLock(); settings.acquireReadLock();
if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user)) && !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
{ {
continue; continue;
} }
try try
{ {
player.getTeleport().now(user, false, TeleportCause.COMMAND); player.getTeleport().now(user.getPlayer(), false, TeleportCause.COMMAND);
} }
catch (Exception ex) catch (Exception ex)
{ {

2
Essentials/src/net/ess3/commands/Commandtpdeny.java
View File

@@ -16,7 +16,7 @@ public class Commandtpdeny extends EssentialsCommand
} }
user.sendMessage(_("requestDenied")); user.sendMessage(_("requestDenied"));
player.sendMessage(_("requestDeniedFrom", user.getDisplayName())); player.sendMessage(_("requestDeniedFrom", user.getPlayer().getDisplayName()));
user.requestTeleport(null, false); user.requestTeleport(null, false);
} }
} }

4
Essentials/src/net/ess3/commands/Commandtphere.java
View File

@@ -17,9 +17,9 @@ public class Commandtphere extends EssentialsCommand
player.acquireReadLock(); player.acquireReadLock();
if (!player.getData().isTeleportEnabled()) if (!player.getData().isTeleportEnabled())
{ {
throw new Exception(_("teleportDisabled", player.getDisplayName())); throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
} }
player.getTeleport().teleport(user, new Trade(commandName, ess), TeleportCause.COMMAND); player.getTeleport().teleport(user.getPlayer(), new Trade(commandName, ess), TeleportCause.COMMAND);
user.sendMessage(_("teleporting")); user.sendMessage(_("teleporting"));
player.sendMessage(_("teleporting")); player.sendMessage(_("teleporting"));
throw new NoChargeException(); throw new NoChargeException();

2
Essentials/src/net/ess3/commands/Commandtpo.java
View File

@@ -27,7 +27,7 @@ public class Commandtpo extends EssentialsCommand
// Verify permission // Verify permission
if (!player.isHidden() || Permissions.TELEPORT_HIDDEN.isAuthorized(user)) if (!player.isHidden() || Permissions.TELEPORT_HIDDEN.isAuthorized(user))
{ {
user.getTeleport().now(player, false, TeleportCause.COMMAND); user.getTeleport().now(player.getPlayer(), false, TeleportCause.COMMAND);
user.sendMessage(_("teleporting")); user.sendMessage(_("teleporting"));
} }
else else

6
Essentials/src/net/ess3/commands/Commandtpohere.java
View File

@@ -31,10 +31,10 @@ public class Commandtpohere extends EssentialsCommand
ISettings settings = ess.getSettings(); ISettings settings = ess.getSettings();
settings.acquireReadLock(); settings.acquireReadLock();
//todo - common method //todo - common method
if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(player)) && !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(player))
{ {
throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName())); throw new Exception(_("noPerm", "essentials.world." + user.getPlayer().getWorld().getName()));
} }

31
Essentials/src/net/ess3/economy/Trade.java
View File

@@ -1,7 +1,10 @@
package net.ess3.economy; package net.ess3.economy;
import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.text.DateFormat;
import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
@@ -12,13 +15,13 @@ import net.ess3.api.ChargeException;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
import net.ess3.api.ISettings; import net.ess3.api.ISettings;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.craftbukkit.InventoryWorkaround;
import net.ess3.permissions.NoCommandCostPermissions; import net.ess3.permissions.NoCommandCostPermissions;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
public class Trade public class Trade
{ {
private final transient String command; private final transient String command;
@@ -74,7 +77,7 @@ public class Trade
} }
if (getItemStack() != null if (getItemStack() != null
&& !user.getInventory().containsItem(true, true, itemStack)) && InventoryWorkaround.containsItem(user.getPlayer().getInventory(), true, true, itemStack))
{ {
throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " "))); throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
} }
@@ -92,7 +95,7 @@ public class Trade
} }
if (exp != null && exp > 0 if (exp != null && exp > 0
&& user.getTotalExperience() < exp) && user.getPlayer().getTotalExperience() < exp)
{ {
throw new ChargeException(_("notEnoughExperience")); throw new ChargeException(_("notEnoughExperience"));
} }
@@ -114,8 +117,8 @@ public class Trade
{ {
if (dropItems) if (dropItems)
{ {
final Map<Integer, ItemStack> leftOver = user.getInventory().addItem(true, getItemStack()); final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getPlayer().getInventory(), true, getItemStack());
final Location loc = user.getLocation(); final Location loc = user.getPlayer().getLocation();
for (ItemStack dropStack : leftOver.values()) for (ItemStack dropStack : leftOver.values())
{ {
final int maxStackSize = dropStack.getType().getMaxStackSize(); final int maxStackSize = dropStack.getType().getMaxStackSize();
@@ -126,25 +129,25 @@ public class Trade
{ {
final ItemStack stack = dropStack.clone(); final ItemStack stack = dropStack.clone();
stack.setAmount(maxStackSize); stack.setAmount(maxStackSize);
itemStacks[i] = user.getWorld().dropItem(loc, stack).getItemStack(); itemStacks[i] = user.getPlayer().getWorld().dropItem(loc, stack).getItemStack();
} }
if (leftover > 0) if (leftover > 0)
{ {
final ItemStack stack = dropStack.clone(); final ItemStack stack = dropStack.clone();
stack.setAmount(leftover); stack.setAmount(leftover);
itemStacks[stacks] = user.getWorld().dropItem(loc, stack).getItemStack(); itemStacks[stacks] = user.getPlayer().getWorld().dropItem(loc, stack).getItemStack();
} }
} }
} }
else else
{ {
success = user.getInventory().addAllItems(true, getItemStack()); success = InventoryWorkaround.addAllItems(user.getPlayer().getInventory(), true, getItemStack());
} }
user.getPlayer().updateInventory(); user.getPlayer().updateInventory();
} }
if (getExperience() != null) if (getExperience() != null)
{ {
user.setTotalExperience(user.getTotalExperience() + getExperience()); user.getPlayer().setTotalExperience(user.getPlayer().getTotalExperience() + getExperience());
} }
return success; return success;
} }
@@ -161,12 +164,12 @@ public class Trade
} }
if (getItemStack() != null) if (getItemStack() != null)
{ {
if (!user.getInventory().containsItem(true, true, itemStack)) if (!InventoryWorkaround.containsItem(user.getPlayer().getInventory(), true, true, itemStack))
{ {
throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " "))); throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
} }
user.getInventory().removeItem(true, true, getItemStack()); InventoryWorkaround.removeItem(user.getPlayer().getInventory() , true, true, getItemStack());
user.updateInventory(); user.getPlayer().updateInventory();
} }
if (command != null && !command.isEmpty() if (command != null && !command.isEmpty()
&& !NoCommandCostPermissions.getPermission(command).isAuthorized(user)) && !NoCommandCostPermissions.getPermission(command).isAuthorized(user))
@@ -183,12 +186,12 @@ public class Trade
} }
if (getExperience() != null) if (getExperience() != null)
{ {
final int experience = user.getTotalExperience(); final int experience = user.getPlayer().getTotalExperience();
if (experience < getExperience() && getExperience() > 0) if (experience < getExperience() && getExperience() > 0)
{ {
throw new ChargeException(_("notEnoughExperience")); throw new ChargeException(_("notEnoughExperience"));
} }
user.setTotalExperience(experience - getExperience()); user.getPlayer().setTotalExperience(experience - getExperience());
} }
} }

21
Essentials/test/net/ess3/testserver/TestServer.java
View File

@@ -3,10 +3,11 @@ package net.ess3.testserver;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import net.ess3.api.server.CommandSender; import org.bukkit.command.CommandSender;
import net.ess3.api.server.Player; import org.bukkit.entity.Player;
import net.ess3.api.server.Server; import org.bukkit.Server;
import net.ess3.api.server.World; import org.bukkit.World;
import org.bukkit.command.ConsoleCommandSender;
public class TestServer implements Server { public class TestServer implements Server {
@@ -45,19 +46,19 @@ public class TestServer implements Server {
} }
@Override @Override
public Collection<Player> getOnlinePlayers() public Player[] getOnlinePlayers()
{ {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public CommandSender getConsoleSender() public ConsoleCommandSender getConsoleSender()
{ {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public void dispatchCommand(CommandSender sender, String command) public boolean dispatchCommand(CommandSender sender, String command)
{ {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@@ -68,12 +69,6 @@ public class TestServer implements Server {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@Override
public <T> T getServiceProvider(Class<T> clazz)
{
throw new UnsupportedOperationException("Not supported yet.");
}
@Override @Override
public String getVersion() public String getVersion()
{ {

6
Essentials/test/net/ess3/testserver/TestWorld.java
View File

@@ -1,9 +1,9 @@
package net.ess3.testserver; package net.ess3.testserver;
import java.util.UUID; import java.util.UUID;
import net.ess3.api.server.ItemStack; import org.bukkit.inventory.ItemStack;
import net.ess3.api.server.Location; import org.bukkit.Location;
import net.ess3.api.server.World; import org.bukkit.World;
import org.bukkit.TreeType; import org.bukkit.TreeType;
public class TestWorld implements World { public class TestWorld implements World {