Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-27 19:47:42 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup open inventories

Browse Source
This commit is contained in:
KHobbits 2013-03-16 11:01:56 +00:00
parent 3ddf883d5d
commit d9a238fb80
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java
View File

@ -1,6 +1,7 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -11,7 +12,7 @@ import org.bukkit.event.server.PluginEnableEvent;
public class EssentialsPluginListener implements Listener, IConf public class EssentialsPluginListener implements Listener, IConf
{ {
private final transient IEssentials ess; private final transient IEssentials ess;
public EssentialsPluginListener(final IEssentials ess) public EssentialsPluginListener(final IEssentials ess)
{ {
this.ess = ess; this.ess = ess;
@ -20,7 +21,8 @@ public class EssentialsPluginListener implements Listener, IConf
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginEnable(final PluginEnableEvent event) public void onPluginEnable(final PluginEnableEvent event)
{ {
if (event.getPlugin().getName().equals("EssentialsChat")) { if (event.getPlugin().getName().equals("EssentialsChat"))
{
ess.getSettings().setEssentialsChatActive(true); ess.getSettings().setEssentialsChatActive(true);
} }
ess.getPermissionsHandler().checkPermissions(); ess.getPermissionsHandler().checkPermissions();
@ -31,10 +33,31 @@ public class EssentialsPluginListener implements Listener, IConf
} }
} }
@EventHandler(priority = EventPriority.NORMAL)
public void cleanupOpenInventories(final PluginDisableEvent event)
{
for (Player player : ess.getServer().getOnlinePlayers())
{
User user = ess.getUser(player);
if (user.isRecipeSee())
{
user.getPlayer().getOpenInventory().getTopInventory().clear();
user.getPlayer().getOpenInventory().close();
user.setRecipeSee(false);
}
if (user.isInvSee())
{
user.getPlayer().getOpenInventory().close();
user.setInvSee(false);
}
}
}
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginDisable(final PluginDisableEvent event) public void onPluginDisable(final PluginDisableEvent event)
{ {
if (event.getPlugin().getName().equals("EssentialsChat")) { if (event.getPlugin().getName().equals("EssentialsChat"))
{
ess.getSettings().setEssentialsChatActive(false); ess.getSettings().setEssentialsChatActive(false);
} }
ess.getPermissionsHandler().checkPermissions(); ess.getPermissionsHandler().checkPermissions();

3
Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
View File

@ -9,6 +9,7 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -26,7 +27,7 @@ public class Commandenchant extends EssentialsCommand
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
final ItemStack stack = user.getItemInHand(); final ItemStack stack = user.getItemInHand();
if (stack == null) if (stack == null || stack.getType() == Material.AIR)
{ {
throw new Exception(_("nothingInHand")); throw new Exception(_("nothingInHand"));
} }