Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-07 19:40:23 +01:00
Code Issues Projects Releases Wiki Activity

#539 new config . remove-god-on-discon if people discon with godmode on it will be turned off on quit.

Browse Source
This commit is contained in:
ementalo 2011-07-07 21:37:55 +01:00
parent 71c11d05fd
commit da8d5454d4
3 changed files with 153 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

284
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -80,7 +80,7 @@ public class EssentialsPlayerListener extends PlayerListener
it.remove(); it.remove();
} }
} }
if(user.isAfk()) if (user.isAfk())
{ {
user.setAfk(false); user.setAfk(false);
ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName())); ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
@ -96,12 +96,12 @@ public class EssentialsPlayerListener extends PlayerListener
} }
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
if(user.isAfk()) if (user.isAfk())
{ {
user.setAfk(false); user.setAfk(false);
ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName())); ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
} }
if (!ess.getSettings().getNetherPortalsEnabled()) if (!ess.getSettings().getNetherPortalsEnabled())
{ {
return; return;
@ -210,7 +210,13 @@ public class EssentialsPlayerListener extends PlayerListener
public void onPlayerQuit(PlayerQuitEvent event) public void onPlayerQuit(PlayerQuitEvent event)
{ {
User user = ess.getUser(event.getPlayer()); User user = ess.getUser(event.getPlayer());
if (ess.getSettings().removeGodOnDiscon())
{
if (user.isGodModeEnabled())
{
user.toggleGodModeEnabled();
}
}
if (user.getSavedInventory() != null) if (user.getSavedInventory() != null)
{ {
user.getInventory().setContents(user.getSavedInventory()); user.getInventory().setContents(user.getSavedInventory());
@ -369,15 +375,15 @@ public class EssentialsPlayerListener extends PlayerListener
} }
/*if (!ess.getSettings().areSignsDisabled() && EssentialsBlockListener.protectedBlocks.contains(event.getClickedBlock().getType())) /*if (!ess.getSettings().areSignsDisabled() && EssentialsBlockListener.protectedBlocks.contains(event.getClickedBlock().getType()))
{ {
if (!user.isAuthorized("essentials.signs.protection.override")) if (!user.isAuthorized("essentials.signs.protection.override"))
{ {
if (essBlockListener.isBlockProtected(event.getClickedBlock(), user)) if (essBlockListener.isBlockProtected(event.getClickedBlock(), user))
{ {
event.setCancelled(true); event.setCancelled(true);
user.sendMessage(Util.format("noAccessPermission", event.getClickedBlock().getType().toString().toLowerCase())); user.sendMessage(Util.format("noAccessPermission", event.getClickedBlock().getType().toString().toLowerCase()));
return; return;
} }
} }
}*/ }*/
if (ess.getSettings().getBedSetsHome() && event.getClickedBlock().getType() == Material.BED_BLOCK) if (ess.getSettings().getBedSetsHome() && event.getClickedBlock().getType() == Material.BED_BLOCK)
@ -395,138 +401,138 @@ public class EssentialsPlayerListener extends PlayerListener
/*if (ess.getSettings().areSignsDisabled()) /*if (ess.getSettings().areSignsDisabled())
{ {
return; return;
} }
if (event.getClickedBlock().getType() != Material.WALL_SIGN && event.getClickedBlock().getType() != Material.SIGN_POST) if (event.getClickedBlock().getType() != Material.WALL_SIGN && event.getClickedBlock().getType() != Material.SIGN_POST)
{ {
return; return;
} }
Sign sign = new CraftSign(event.getClickedBlock()); Sign sign = new CraftSign(event.getClickedBlock());
try try
{ {
if (sign.getLine(0).equals("§1[Free]") && user.isAuthorized("essentials.signs.free.use")) if (sign.getLine(0).equals("§1[Free]") && user.isAuthorized("essentials.signs.free.use"))
{ {
ItemStack item = ItemDb.get(sign.getLine(1)); ItemStack item = ItemDb.get(sign.getLine(1));
CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(user.getHandle())); CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(user.getHandle()));
inv.clear(); inv.clear();
item.setAmount(9 * 4 * 64); item.setAmount(9 * 4 * 64);
inv.addItem(item); inv.addItem(item);
user.showInventory(inv); user.showInventory(inv);
return; return;
} }
if (sign.getLine(0).equals("§1[Disposal]") && user.isAuthorized("essentials.signs.disposal.use")) if (sign.getLine(0).equals("§1[Disposal]") && user.isAuthorized("essentials.signs.disposal.use"))
{ {
CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(user.getHandle())); CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(user.getHandle()));
inv.clear(); inv.clear();
user.showInventory(inv); user.showInventory(inv);
return; return;
} }
if (sign.getLine(0).equals("§1[Heal]") && user.isAuthorized("essentials.signs.heal.use")) if (sign.getLine(0).equals("§1[Heal]") && user.isAuthorized("essentials.signs.heal.use"))
{ {
if (!sign.getLine(1).isEmpty()) if (!sign.getLine(1).isEmpty())
{ {
String[] l1 = sign.getLine(1).split("[ :-]+"); String[] l1 = sign.getLine(1).split("[ :-]+");
boolean m1 = l1[0].matches("^[^0-9][\\.0-9]+"); boolean m1 = l1[0].matches("^[^0-9][\\.0-9]+");
double q1 = Double.parseDouble(m1 ? l1[0].substring(1) : l1[0]); double q1 = Double.parseDouble(m1 ? l1[0].substring(1) : l1[0]);
if (!m1 && (int)q1 < 1) if (!m1 && (int)q1 < 1)
{ {
throw new Exception(Util.i18n("moreThanZero")); throw new Exception(Util.i18n("moreThanZero"));
} }
if (m1) if (m1)
{ {
if (user.getMoney() < q1) if (user.getMoney() < q1)
{ {
throw new Exception(Util.i18n("notEnoughMoney")); throw new Exception(Util.i18n("notEnoughMoney"));
} }
user.takeMoney(q1); user.takeMoney(q1);
user.sendMessage(Util.format("moneyTaken", Util.formatCurrency(q1))); user.sendMessage(Util.format("moneyTaken", Util.formatCurrency(q1)));
} }
else else
{ {
ItemStack i = ItemDb.get(l1[1], (int)q1); ItemStack i = ItemDb.get(l1[1], (int)q1);
if (!InventoryWorkaround.containsItem(user.getInventory(), true, i)) if (!InventoryWorkaround.containsItem(user.getInventory(), true, i))
{ {
throw new Exception(Util.format("missingItems", (int)q1, l1[1])); throw new Exception(Util.format("missingItems", (int)q1, l1[1]));
} }
InventoryWorkaround.removeItem(user.getInventory(), true, i); InventoryWorkaround.removeItem(user.getInventory(), true, i);
user.updateInventory(); user.updateInventory();
} }
} }
user.setHealth(20); user.setHealth(20);
user.sendMessage(Util.i18n("youAreHealed")); user.sendMessage(Util.i18n("youAreHealed"));
return; return;
} }
if (sign.getLine(0).equals("§1[Mail]") && user.isAuthorized("essentials.signs.mail.use") && user.isAuthorized("essentials.mail")) if (sign.getLine(0).equals("§1[Mail]") && user.isAuthorized("essentials.signs.mail.use") && user.isAuthorized("essentials.mail"))
{ {
List<String> mail = user.getMails(); List<String> mail = user.getMails();
if (mail.isEmpty()) if (mail.isEmpty())
{ {
user.sendMessage(Util.i18n("noNewMail")); user.sendMessage(Util.i18n("noNewMail"));
return; return;
} }
for (String s : mail) for (String s : mail)
{ {
user.sendMessage(s); user.sendMessage(s);
} }
user.sendMessage(Util.i18n("markMailAsRead")); user.sendMessage(Util.i18n("markMailAsRead"));
return; return;
} }
if (sign.getLine(0).equals("§1[Balance]") && user.isAuthorized("essentials.signs.balance.use")) if (sign.getLine(0).equals("§1[Balance]") && user.isAuthorized("essentials.signs.balance.use"))
{ {
user.sendMessage(Util.format("balance", user.getMoney())); user.sendMessage(Util.format("balance", user.getMoney()));
return; return;
} }
if (sign.getLine(0).equals("§1[Warp]")) if (sign.getLine(0).equals("§1[Warp]"))
{ {
if (!sign.getLine(2).isEmpty()) if (!sign.getLine(2).isEmpty())
{ {
if (sign.getLine(2).equals("§2Everyone")) if (sign.getLine(2).equals("§2Everyone"))
{ {
Trade charge = chargeUserForWarp(sign, user); Trade charge = chargeUserForWarp(sign, user);
user.getTeleport().warp(sign.getLine(1), charge); user.getTeleport().warp(sign.getLine(1), charge);
return; return;
} }
if (user.inGroup(sign.getLine(2))) if (user.inGroup(sign.getLine(2)))
{ {
Trade charge = chargeUserForWarp(sign, user); Trade charge = chargeUserForWarp(sign, user);
user.getTeleport().warp(sign.getLine(1), charge); user.getTeleport().warp(sign.getLine(1), charge);
return; return;
} }
} }
if (user.isAuthorized("essentials.signs.warp.use") if (user.isAuthorized("essentials.signs.warp.use")
&& (!ess.getSettings().getPerWarpPermission() || user.isAuthorized("essentials.warp." + sign.getLine(1)))) && (!ess.getSettings().getPerWarpPermission() || user.isAuthorized("essentials.warp." + sign.getLine(1))))
{ {
Trade charge = chargeUserForWarp(sign, user); Trade charge = chargeUserForWarp(sign, user);
user.getTeleport().warp(sign.getLine(1), charge); user.getTeleport().warp(sign.getLine(1), charge);
} }
return; return;
} }
if (sign.getLine(0).equals("§1[Time]") && user.isAuthorized("essentials.signs.time.use")) if (sign.getLine(0).equals("§1[Time]") && user.isAuthorized("essentials.signs.time.use"))
{ {
long time = user.getWorld().getTime(); long time = user.getWorld().getTime();
time -= time % 24000; time -= time % 24000;
if ("day".equalsIgnoreCase(sign.getLine(1))) if ("day".equalsIgnoreCase(sign.getLine(1)))
{ {
user.getWorld().setTime(time + 24000); user.getWorld().setTime(time + 24000);
return; return;
} }
if ("night".equalsIgnoreCase(sign.getLine(1))) if ("night".equalsIgnoreCase(sign.getLine(1)))
{ {
user.getWorld().setTime(time + 37700); user.getWorld().setTime(time + 37700);
return; return;
} }
throw new Exception(Util.i18n("onlyDayNight")); throw new Exception(Util.i18n("onlyDayNight"));
} }
} }
catch (Throwable ex) catch (Throwable ex)
{ {
user.sendMessage(Util.format("errorWithMessage", ex.getMessage())); user.sendMessage(Util.format("errorWithMessage", ex.getMessage()));
if (ess.getSettings().isDebug()) if (ess.getSettings().isDebug())
{ {
logger.log(Level.WARNING, ex.getMessage(), ex); logger.log(Level.WARNING, ex.getMessage(), ex);
} }
}*/ }*/
} }
@ -624,13 +630,13 @@ public class EssentialsPlayerListener extends PlayerListener
user.getServer().dispatchCommand(user, command); user.getServer().dispatchCommand(user, command);
} }
} }
@Override @Override
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event)
{ {
if (event.isCancelled()) return; if (event.isCancelled()) return;
User user = ess.getUser(event.getPlayer()); User user = ess.getUser(event.getPlayer());
String cmd = event.getMessage().toLowerCase(); String cmd = event.getMessage().toLowerCase();
if (("msg".equals(cmd) || "r".equals(cmd) || "mail".equals(cmd))) if (("msg".equals(cmd) || "r".equals(cmd) || "mail".equals(cmd)))
{ {
for (Player player : ess.getServer().getOnlinePlayers()) for (Player player : ess.getServer().getOnlinePlayers())
@ -641,7 +647,7 @@ public class EssentialsPlayerListener extends PlayerListener
} }
} }
} }
if(user.isAfk()) if (user.isAfk())
{ {
user.setAfk(false); user.setAfk(false);
ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName())); ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));

6
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -390,4 +390,10 @@ public class Settings implements IConf
{ {
return config.getBoolean("economy-log-enabled", false); return config.getBoolean("economy-log-enabled", false);
} }
boolean removeGodOnDiscon()
{
return config.getBoolean("remove-god-on-discon", false);
}
} }

2
Essentials/src/config.yml
View File

@ -191,6 +191,8 @@ debug: false
# If you don't set this, the default locale of the server will be used. # If you don't set this, the default locale of the server will be used.
#locale: de_DE #locale: de_DE
#turn off god mode when people exit
remove-god-on-discon: false
############################################################ ############################################################
# +------------------------------------------------------+ # # +------------------------------------------------------+ #
# | EssentialsHome | # # | EssentialsHome | #