diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-04 00:24:32 +0100 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-04 00:24:32 +0100 |
| commit | 59babb2c31b9ffb6b94e5072559e18f853d19b23 (patch) | |
| tree | 16b9dfb577d60f38386c09493c969f50b4b4fd9c /src/main | |
| parent | c8d77561b16e9edc75b05a10f546ef919a717a92 (diff) | |
| download | craftbukkit-59babb2c31b9ffb6b94e5072559e18f853d19b23.tar craftbukkit-59babb2c31b9ffb6b94e5072559e18f853d19b23.tar.gz craftbukkit-59babb2c31b9ffb6b94e5072559e18f853d19b23.tar.lz craftbukkit-59babb2c31b9ffb6b94e5072559e18f853d19b23.tar.xz craftbukkit-59babb2c31b9ffb6b94e5072559e18f853d19b23.zip | |
Fixed issue with console being subscribed multiple times to permissions
Diffstat (limited to 'src/main')
3 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 7724354c..a8241311 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -710,8 +710,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener { } s = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage()); - ColouredConsoleSender c = new ColouredConsoleSender(this.minecraftServer.server); - c.sendMessage(s); + minecraftServer.console.sendMessage(s); for (Player recipient : event.getRecipients()) { recipient.sendMessage(s); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index fae0d803..c605cca8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -111,7 +111,6 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { public void setOp(boolean value) { this.op = value; perm.recalculatePermissions(); - perm.calculatePermissions(); } public Set<PermissionAttachmentInfo> getEffectivePermissions() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 4a1fa601..fda5098b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -49,7 +49,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } perm.recalculatePermissions(); - perm.calculatePermissions(); } public boolean isPlayer() { |