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

This reverts commit 66edbcea80, reversing
changes made to 3fd962289c.

src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java

@@ -86,6 +86,10 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
 		NoppesUtilPlayer.teleportPlayer(player, x, y, z, player.dimension);
 	}
 
+	public void setPosition(IPos pos) {
+		this.setPosition(pos.getX(),pos.getY(),pos.getZ());
+	}
+
 	public void setPosition(double x, double y, double z, int dimensionId){
 		if (NpcAPI.Instance().getIWorld(dimensionId) == null)
 			return;
@@ -93,6 +97,10 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
 		NoppesUtilPlayer.teleportPlayer(player, x, y, z, dimensionId);
 	}
 
+	public void setPosition(IPos pos, int dimensionId) {
+		this.setPosition(pos.getX(),pos.getY(),pos.getZ(), dimensionId);
+	}
+
 	public int getHunger(){
 		return player.getFoodStats().getFoodLevel();
 	}
@@ -505,6 +513,10 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
 		y = ValueUtil.CorrectInt(y, 0, 256);
         player.setSpawnChunk(new ChunkCoordinates(x, y, z), true);
 	}
+
+	public void setSpawnpoint(IPos pos){
+		this.setSpawnpoint(pos.getX(),pos.getY(),pos.getZ());
+	}
 	
 	public void resetSpawnpoint(){
 		player.setSpawnChunk(null, false);