Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-30 14:13:23 +01:00
Code Issues Projects Releases Wiki Activity

Server reload isn't broken anymore: now removing Spout widgets at Spout plugin disable-time, since Spout was already gone by the time War was getting disabled and tried to remove them.

Browse Source
This commit is contained in:
taoneill 2012-01-07 00:36:29 -05:00
parent 1bae53670e
commit 589d197bf1
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
war/src/main/java/bukkit/tommytony/war/War.java
View File

@ -61,6 +61,8 @@ public class War extends JavaPlugin {
private WarPlayerListener playerListener = new WarPlayerListener(); private WarPlayerListener playerListener = new WarPlayerListener();
private WarEntityListener entityListener = new WarEntityListener(); private WarEntityListener entityListener = new WarEntityListener();
private WarBlockListener blockListener = new WarBlockListener(); private WarBlockListener blockListener = new WarBlockListener();
private WarServerListener pluginListener = new WarServerListener();
private WarCommandHandler commandHandler = new WarCommandHandler(); private WarCommandHandler commandHandler = new WarCommandHandler();
private Logger logger; private Logger logger;
private PluginDescriptionFile desc = null; private PluginDescriptionFile desc = null;
@ -158,6 +160,8 @@ public class War extends JavaPlugin {
pm.registerEvent(Event.Type.BLOCK_PISTON_EXTEND, this.blockListener, Priority.Normal, this); pm.registerEvent(Event.Type.BLOCK_PISTON_EXTEND, this.blockListener, Priority.Normal, this);
pm.registerEvent(Event.Type.BLOCK_PISTON_RETRACT, this.blockListener, Priority.Normal, this); pm.registerEvent(Event.Type.BLOCK_PISTON_RETRACT, this.blockListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLUGIN_DISABLE, this.pluginListener, Priority.Normal, this);
if (this.isSpoutServer()) { if (this.isSpoutServer()) {
pm.registerEvent(Event.Type.CUSTOM_EVENT, new WarSpoutListener(this), Priority.Low, this); pm.registerEvent(Event.Type.CUSTOM_EVENT, new WarSpoutListener(this), Priority.Low, this);
} }
@ -265,15 +269,6 @@ public class War extends JavaPlugin {
* Cleans up war * Cleans up war
*/ */
public void unloadWar() { public void unloadWar() {
if (this.isSpoutServer()) {
for (Player player : getServer().getOnlinePlayers()) {
SpoutPlayer sp = (SpoutPlayer) player;
if (sp.isSpoutCraftEnabled()) {
sp.getMainScreen().removeWidgets(this);
}
}
}
for (Warzone warzone : this.warzones) { for (Warzone warzone : this.warzones) {
warzone.unload(); warzone.unload();
} }

27
war/src/main/java/bukkit/tommytony/war/WarServerListener.java Normal file
View File

@ -0,0 +1,27 @@
package bukkit.tommytony.war;
import org.bukkit.entity.Player;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.plugin.java.JavaPlugin;
import org.getspout.spoutapi.player.SpoutPlayer;
public class WarServerListener extends ServerListener {
public void onPluginDisable(PluginDisableEvent event) {
if (event.getPlugin() instanceof JavaPlugin) {
JavaPlugin plugin = (JavaPlugin)event.getPlugin();
if (plugin.getDataFolder().getName().equals("Spout")) {
if (War.war.isSpoutServer()) {
for (Player player : War.war.getServer().getOnlinePlayers()) {
SpoutPlayer sp = (SpoutPlayer) player;
if (sp.isSpoutCraftEnabled()) {
sp.getMainScreen().removeWidgets(War.war);
}
}
}
}
}
}
}