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

Don't close inventories every plugin disable, just our own.

Browse Source
This commit is contained in:
KHobbits 2013-03-19 21:05:12 +00:00
parent a5ec8b9cbb
commit 61b115ceac
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -291,6 +291,7 @@ public class Essentials extends JavaPlugin implements IEssentials
p.sendMessage(_("unvanishedReload")); p.sendMessage(_("unvanishedReload"));
} }
} }
cleanupOpenInventories();
i18n.onDisable(); i18n.onDisable();
Economy.setEss(null); Economy.setEss(null);
Trade.closeLog(); Trade.closeLog();
@ -456,6 +457,26 @@ public class Essentials extends JavaPlugin implements IEssentials
return true; return true;
} }
} }
public void cleanupOpenInventories()
{
for (Player player : getServer().getOnlinePlayers())
{
User user = getUser(player);
if (user.isRecipeSee())
{
user.getPlayer().getOpenInventory().getTopInventory().clear();
user.getPlayer().getOpenInventory().close();
user.setRecipeSee(false);
}
if (user.isInvSee() || user.isEnderSee())
{
user.getPlayer().getOpenInventory().close();
user.setInvSee(false);
user.setEnderSee(false);
}
}
}
@Override @Override
public void showError(final CommandSender sender, final Throwable exception, final String commandLabel) public void showError(final CommandSender sender, final Throwable exception, final String commandLabel)

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

@ -31,27 +31,7 @@ public class EssentialsPluginListener implements Listener, IConf
{ {
ess.getLogger().log(Level.INFO, "Payment method found (" + ess.getPaymentMethod().getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")"); ess.getLogger().log(Level.INFO, "Payment method found (" + ess.getPaymentMethod().getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
} }
} }
@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)