From a4585fdf4deb9874bdbfe03713634e309b048e2f Mon Sep 17 00:00:00 2001 From: c0508383 Date: Wed, 6 Jul 2022 00:24:14 -0700 Subject: [PATCH] IWorld: -Undid previous commit, not implemented correctly. --- src/main/java/noppes/npcs/scripted/ScriptWorld.java | 11 ----------- .../java/noppes/npcs/scripted/interfaces/IWorld.java | 2 -- 2 files changed, 13 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/ScriptWorld.java b/src/main/java/noppes/npcs/scripted/ScriptWorld.java index 2b8ea1ba9..7bff4c428 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptWorld.java +++ b/src/main/java/noppes/npcs/scripted/ScriptWorld.java @@ -589,20 +589,9 @@ public class ScriptWorld implements IWorld { * @return Returns the entity which was spawned */ public IEntity spawnClone(int x, int y, int z, int tab, String name){ - return spawnClone(x,y,z,tab,name,true); - } - - public IEntity spawnClone(int x, int y, int z, int tab, String name, boolean ignoreProtection){ NBTTagCompound compound = ServerCloneController.Instance.getCloneData(null, name, tab); if(compound == null) return null; - - if (!ignoreProtection) { - FakePlayer fakePlayer = new FakePlayer(world, new GameProfile(null, "NpcAPI")); - if (!CustomNpcsPermissions.hasPermission(fakePlayer, EnumPacketServer.SpawnMob.permission)) - return null; - } - Entity entity = NoppesUtilServer.spawnClone(compound, x, y, z, world); if(entity == null) return null; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java b/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java index c7d1e6297..275d51e0f 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/IWorld.java @@ -350,8 +350,6 @@ public interface IWorld { */ IEntity spawnClone(int x, int y, int z, int tab, String name); - IEntity spawnClone(int x, int y, int z, int tab, String name, boolean ignoreProtection); - ScriptScoreboard getScoreboard(); /**