19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 0b5adb4006976878c7a02dafb0ca526d7f1345e6 Mon Sep 17 00:00:00 2001
|
|
From: FrozenBrain <carstenbamsti@googlemail.com>
|
|
Date: Sun, 2 Mar 2014 21:13:46 +0100
|
|
Subject: [PATCH] Use one PermissibleBase for all Command Blocks
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
|
|
index 1314c74..b339cf3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
|
|
@@ -12,9 +12,18 @@ import org.bukkit.plugin.Plugin;
|
|
import java.util.Set;
|
|
|
|
public abstract class ServerCommandSender implements CommandSender {
|
|
- private final PermissibleBase perm = new PermissibleBase(this);
|
|
+ private static PermissibleBase blockPermInst;
|
|
+ private final PermissibleBase perm;
|
|
|
|
public ServerCommandSender() {
|
|
+ if (this instanceof CraftBlockCommandSender) {
|
|
+ if (blockPermInst == null) {
|
|
+ blockPermInst = new PermissibleBase(this);
|
|
+ }
|
|
+ this.perm = blockPermInst;
|
|
+ } else {
|
|
+ this.perm = new PermissibleBase(this);
|
|
+ }
|
|
}
|
|
|
|
public boolean isPermissionSet(String name) {
|
|
--
|
|
2.1.0
|
|
|