Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-04-01 22:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add BukkitPlayer constructor without plugin.

Browse Source 
tbh I don't know why we even need to keep the plugin object around.
This commit is contained in:
wizjany 2019-03-30 17:32:10 -04:00
parent a80420d14b
commit 961da1b93f
2 changed files with 6 additions and 2 deletions
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit
BukkitPlayer.javaBukkitServerInterface.java

4
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java

@ -52,6 +52,10 @@ public class BukkitPlayer extends AbstractPlayerActor {
private Player player;
private WorldEditPlugin plugin;
public BukkitPlayer(Player player) {
this(WorldEditPlugin.getInstance(), player);
}
public BukkitPlayer(WorldEditPlugin plugin, Player player) {
this.plugin = plugin;
this.player = player;

4
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java

@ -100,7 +100,7 @@ public class BukkitServerInterface implements MultiUserPlatform {
return player;
} else {
org.bukkit.entity.Player bukkitPlayer = server.getPlayerExact(player.getName());
return bukkitPlayer != null ? new BukkitPlayer(plugin, bukkitPlayer) : null;
return bukkitPlayer != null ? WorldEditPlugin.getInstance().wrapPlayer(bukkitPlayer) : null;
}
}
@ -177,7 +177,7 @@ public class BukkitServerInterface implements MultiUserPlatform {
public Collection<Actor> getConnectedUsers() {
List<Actor> users = new ArrayList<>();
for (org.bukkit.entity.Player player : Bukkit.getServer().getOnlinePlayers()) {
users.add(new BukkitPlayer(plugin, player));
users.add(WorldEditPlugin.getInstance().wrapPlayer(player));
}
return users;
}