OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-06 02:35:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Only create PermissibleBase instance in CraftEntity the first time it is actually needed. Fixes static test cases for subclasses failing when perm field was instantiated.

Browse source
This commit is contained in:
Matthew 2016-03-21 18:51:07 -04:00 committed by md_5
parent 5fe510da59
commit c5d27c5f6f
1 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View file

@ -25,18 +25,7 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.util.Vector;
public abstract class CraftEntity implements org.bukkit.entity.Entity {
private static final PermissibleBase perm = new PermissibleBase(new ServerOperator() {
@Override
public boolean isOp() {
return false;
}
@Override
public void setOp(boolean value) {
}
});
private static PermissibleBase perm;
protected final CraftServer server;
protected Entity entity;
@ -487,67 +476,67 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@Override
public boolean isPermissionSet(String name) {
return perm.isPermissionSet(name);
return getPermissibleBase().isPermissionSet(name);
}
@Override
public boolean isPermissionSet(Permission perm) {
return CraftEntity.perm.isPermissionSet(perm);
return CraftEntity.getPermissibleBase().isPermissionSet(perm);
}
@Override
public boolean hasPermission(String name) {
return perm.hasPermission(name);
return getPermissibleBase().hasPermission(name);
}
@Override
public boolean hasPermission(Permission perm) {
return this.perm.hasPermission(perm);
return getPermissibleBase().hasPermission(perm);
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) {
return perm.addAttachment(plugin, name, value);
return getPermissibleBase().addAttachment(plugin, name, value);
}
@Override
public PermissionAttachment addAttachment(Plugin plugin) {
return perm.addAttachment(plugin);
return getPermissibleBase().addAttachment(plugin);
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) {
return perm.addAttachment(plugin, name, value, ticks);
return getPermissibleBase().addAttachment(plugin, name, value, ticks);
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, int ticks) {
return perm.addAttachment(plugin, ticks);
return getPermissibleBase().addAttachment(plugin, ticks);
}
@Override
public void removeAttachment(PermissionAttachment attachment) {
perm.removeAttachment(attachment);
getPermissibleBase().removeAttachment(attachment);
}
@Override
public void recalculatePermissions() {
perm.recalculatePermissions();
getPermissibleBase().recalculatePermissions();
}
@Override
public Set<PermissionAttachmentInfo> getEffectivePermissions() {
return perm.getEffectivePermissions();
return getPermissibleBase().getEffectivePermissions();
}
@Override
public boolean isOp() {
return perm.isOp();
return getPermissibleBase().isOp();
}
@Override
public void setOp(boolean value) {
perm.setOp(value);
getPermissibleBase().setOp(value);
}
@Override
@ -563,4 +552,22 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public boolean isGlowing() {
return getHandle().glowing;
}
private static PermissibleBase getPermissibleBase() {
if (perm == null) {
perm = new PermissibleBase(new ServerOperator() {
@Override
public boolean isOp() {
return false;
}
@Override
public void setOp(boolean value) {
}
});
}
return perm;
}
}