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

reduce diff

Browse Source
This commit is contained in:
Jesse Boyd
2019-11-21 07:57:32 +00:00
parent 52a502a1c6
commit 37b6c406ac
18 changed files with 248 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
View File

@ -182,7 +182,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
@Override
public void printError(String msg) {
for (String part : msg.split("\n")) {
player.sendMessage("§c" + part);
player.sendMessage("\u00A7c" + part);
}
}
@ -226,18 +226,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
@Override
public boolean hasPermission(String perm) {
return (!plugin.getLocalConfiguration().noOpPermissions && player.isOp())
|| plugin.getPermissionsResolver().hasPermission(player.getWorld().getName(), player, perm);
}
@Override
public boolean isAllowedToFly() {
return player.getAllowFlight();
}
@Override
public void setFlying(boolean flying) {
player.setFlying(flying);
return (!plugin.getLocalConfiguration().noOpPermissions && player.isOp());
}
@Override
@ -272,14 +261,14 @@ public class BukkitPlayer extends AbstractPlayerActor {
player.sendPluginMessage(plugin, WorldEditPlugin.CUI_PLUGIN_CHANNEL, send.getBytes(CUIChannelListener.UTF_8_CHARSET));
}
public Player getPlayer() {
if (!player.isValid()) {
Player tmp = Bukkit.getPlayer(getUniqueId());
if (tmp != null) {
player = tmp;
}
}
return player;
@Override
public boolean isAllowedToFly() {
return player.getAllowFlight();
}
@Override
public void setFlying(boolean flying) {
player.setFlying(flying);
}
@Override
@ -311,7 +300,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
@Override
public SessionKey getSessionKey() {
return new SessionKeyImpl(getUniqueId(), getName());
return new SessionKeyImpl(this.player.getUniqueId(), player.getName());
}
private static class SessionKeyImpl implements SessionKey {
@ -382,4 +371,14 @@ public class BukkitPlayer extends AbstractPlayerActor {
public void unregister() {
player.removeMetadata("WE", WorldEditPlugin.getInstance());
}
public Player getPlayer() {
if (!player.isValid()) {
Player tmp = Bukkit.getPlayer(getUniqueId());
if (tmp != null) {
player = tmp;
}
}
return player;
}
}