diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java index dc644e4..a2b4a65 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -140,7 +140,7 @@ else { this.setOnlineMode(settings.settings.authorization.onlineMode); - this.setHostname(settings.listen.serverIP); + this.setHostname(settings.listen.minecraft.serverIP); } this.setCanSpawnAnimals(globalWConf.mobSpawn.spawnAnimals); diff --git a/src/main/java/net/minecraft/server/management/ItemInWorldManager.java b/src/main/java/net/minecraft/server/management/ItemInWorldManager.java index 68d6ce5..56b95b1 100644 --- a/src/main/java/net/minecraft/server/management/ItemInWorldManager.java +++ b/src/main/java/net/minecraft/server/management/ItemInWorldManager.java @@ -1,5 +1,7 @@ package net.minecraft.server.management; +import org.ultramine.server.ConfigurationHandler; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +15,7 @@ import net.minecraft.world.WorldSettings; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.Event; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; @@ -40,6 +43,8 @@ private int initialBlockDamage; private int durabilityRemainingOnBlock; private static final String __OBFID = "CL_00001442"; + + private static final boolean isServer = FMLCommonHandler.instance().getSide().isServer(); public ItemInWorldManager(World p_i1524_1_) { @@ -210,7 +215,7 @@ { float f = block.getPlayerRelativeBlockHardness(this.thisPlayerMP, this.thisPlayerMP.worldObj, p_73082_1_, p_73082_2_, p_73082_3_) * (float)(l + 1); - if (f >= 0.7F) + if (f >= 0.7F || !isServer || !ConfigurationHandler.getServerConfig().settings.security.checkBreakSpeed) { this.isDestroyingBlock = false; this.theWorld.destroyBlockInWorldPartially(this.thisPlayerMP.getEntityId(), p_73082_1_, p_73082_2_, p_73082_3_, -1); diff --git a/src/main/java/org/ultramine/server/UltramineServerConfig.java b/src/main/java/org/ultramine/server/UltramineServerConfig.java index c02f623..289b53d 100644 --- a/src/main/java/org/ultramine/server/UltramineServerConfig.java +++ b/src/main/java/org/ultramine/server/UltramineServerConfig.java @@ -13,13 +13,13 @@ public static class ListenConf { - public String serverIP = ""; public MinecraftConf minecraft = new MinecraftConf(); public QueryConf query = new QueryConf(); public RConConf rcon = new RConConf(); public static class MinecraftConf { + public String serverIP = ""; public int port = 25565; } @@ -47,6 +47,7 @@ public MessagesConf messages = new MessagesConf(); public WatchdogThreadConf watchdogThread = new WatchdogThreadConf(); public SQLServerStorageConf inSQLServerStorage = new SQLServerStorageConf(); + public SecurityConf security = new SecurityConf(); public static class AuthorizationConf { @@ -102,6 +103,11 @@ public String database = "global"; public String tablePrefix = "mc_"; } + + public static class SecurityConf + { + public boolean checkBreakSpeed = true; + } } public static class DatabaseConf