diff --git a/common/src/main/java/common/init/Config.java b/common/src/main/java/common/init/Config.java index 5b59f78..885a800 100755 --- a/common/src/main/java/common/init/Config.java +++ b/common/src/main/java/common/init/Config.java @@ -464,11 +464,6 @@ public abstract class Config { @Var(name = "knockback") public static float knockback = 1.0f; - @Var(name = "spawnYaw", min = -180.0f, max = 180.0f) - public static float spawnYaw = -90.0f; - @Var(name = "spawnPitch", min = -89.0f, max = 89.0f) - public static float spawnPitch = 0.0f; - @Var(name = "password", nonDefault = true) public static String password = ""; @Var(name = "baseSeed", nonDefault = true) diff --git a/common/src/main/java/common/tileentity/TileEntityTianReactor.java b/common/src/main/java/common/tileentity/TileEntityTianReactor.java index 5dd7416..17b8703 100755 --- a/common/src/main/java/common/tileentity/TileEntityTianReactor.java +++ b/common/src/main/java/common/tileentity/TileEntityTianReactor.java @@ -12,14 +12,12 @@ public class TileEntityTianReactor extends TileEntityDevice { } protected boolean executeFunction() { - if(!this.hasAmount(0, 2)) // && !this.isCreative) + if(!this.hasAmount(0, 2)) return false; if(this.rand.rarity(5)) return true; -// if(!this.isCreative) { this.decrStackSize(0, 2); this.decrStackSize(1, 1); -// } this.getResource(0).add(this.rand.range(this.temperature / 200, this.temperature / 50), 20, false); return true; } diff --git a/server/src/main/java/server/Server.java b/server/src/main/java/server/Server.java index 8ca0888..5bd2ab4 100755 --- a/server/src/main/java/server/Server.java +++ b/server/src/main/java/server/Server.java @@ -739,9 +739,7 @@ public final class Server implements IThreadListener { int y = pos.getY(); while(world.getState(new BlockPos(pos.getX(), y, pos.getZ())).getBlock().getMaterial().blocksMovement() && y < 511) y++; - return new Position(pos.getX() + 0.5d, (double)y, pos.getZ() + 0.5d, - radius > 0 ? (-180.0f + world.rand.floatv() * 360.0f) : Config.spawnYaw, - radius > 0 ? 0.0f : Config.spawnPitch, world.dimension.getDimensionId()); + return new Position(pos.getX() + 0.5, (double)y, pos.getZ() + 0.5, -180.0f + world.rand.floatv() * 360.0f, 0.0f, world.dimension.getDimensionId()); } public void addUser(User user) {