Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 12:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/mapping

Browse Source
This commit is contained in:
sk89q
2014-07-01 12:59:55 -07:00
parent dd924d806b 1b0a6bfcd8
commit 7a5ea73c57
28 changed files with 775 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java
View File

@ -30,12 +30,12 @@ import java.io.File;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
class BukkitCommandSender implements Actor {
public class BukkitCommandSender implements Actor {
private CommandSender sender;
private WorldEditPlugin plugin;
BukkitCommandSender(WorldEditPlugin plugin, CommandSender sender) {
public BukkitCommandSender(WorldEditPlugin plugin, CommandSender sender) {
checkNotNull(plugin);
checkNotNull(sender);
checkArgument(!(sender instanceof Player), "Cannot wrap a player");

10
src/bukkit/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -156,10 +156,12 @@ public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
*/
@Override
public void onDisable() {
controller.clearSessions();
controller.getPlatformManager().unregister(server);
config.unload();
server.unregisterCommands();
if (controller != null) {
controller.clearSessions();
controller.getPlatformManager().unregister(server);
config.unload();
server.unregisterCommands();
}
this.getServer().getScheduler().cancelTasks(this);
}