Revert "Merge remote-tracking branch 'origin/dev' into dev"

This reverts commit 66edbcea80, reversing
changes made to 3fd962289c.
This commit is contained in:
Luis C.M committed 2022-11-06 01:25:28 -06:00
1 parent 66edbcea80
commit 8d3cd3fd82
58 files changed
+780 -284

No files matched your search

@@ -19,6 +19,7 @@ import noppes.npcs.LogWriter;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.scripted.CustomNPCsException;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.interfaces.IPos;
import noppes.npcs.scripted.interfaces.handler.ICloneHandler;
import noppes.npcs.scripted.interfaces.entity.IEntity;
import noppes.npcs.scripted.interfaces.IWorld;
@@ -209,10 +210,18 @@ public class ServerCloneController implements ICloneHandler {
}
}
public IEntity spawn(IPos pos, int tab, String name, IWorld world, boolean ignoreProtection) {
return this.spawn(pos.getX(),pos.getY(),pos.getZ(),tab,name,world,ignoreProtection);
}
public IEntity spawn(double x, double y, double z, int tab, String name, IWorld world) {
return spawn(x, y, z, tab, name, world, true);
}
public IEntity spawn(IPos pos, int tab, String name, IWorld world) {
return this.spawn(pos.getX(),pos.getY(),pos.getZ(),tab,name,world);
}
public IEntity[] getTab(int tab, IWorld world) {
File dir = new File(getDir(), tab + "");
if (!dir.exists() || !dir.isDirectory() || dir.listFiles() == null) {