xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Limit TNT detonations per world per tick

Browse Source
This commit is contained in:
Sergey Shatunov
2016-01-05 14:20:01 +07:00
parent 0aad7977fc
commit 0011dd0d9a
4 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/spigotmc/SpigotConfig.java
View File

@ -50,8 +50,8 @@ public class SpigotConfig
commands = new HashMap<String, Command>();
version = getInt( "config-version", 5 );
set( "config-version", 5 );
version = getInt( "config-version", 7 );
set( "config-version", 7 );
readConfig( SpigotConfig.class, null );
}
@ -152,7 +152,7 @@ public class SpigotConfig
public static String unknownCommandMessage;
public static String serverFullMessage;
public static String outdatedClientMessage = "Outdated client! Please use {}";
public static String outdatedServerMessage = "Outdated server! I\'m still on {0}";
public static String outdatedServerMessage = "Outdated server! I\'m still on {}";
private static String transform(String s)
{
return ChatColor.translateAlternateColorCodes( '&', s ).replaceAll( "\\n", "\n" );
@ -199,7 +199,10 @@ public class SpigotConfig
private static void nettyThreads()
{
int count = getInt( "settings.netty-threads", 4 );
if (version < 7)
set("settings.netty-threads", -1);
int count = getInt( "settings.netty-threads", -1 );
count = count == -1 ? Runtime.getRuntime().availableProcessors() : count;
System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) );
Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count );
}

11
src/main/java/org/spigotmc/SpigotWorldConfig.java
View File

@ -287,4 +287,15 @@ public class SpigotWorldConfig
entityMaxTickTime = getInt("max-tick-time.entity", 50);
log("Tile Max Tick Time: " + tileMaxTickTime + "ms Entity max Tick Time: " + entityMaxTickTime + "ms");
}
public int currentPrimedTnt = 0;
public int maxTntTicksPerTick;
private void maxTntPerTick() {
if ( SpigotConfig.version < 7 )
{
set( "max-tnt-per-tick", 100 );
}
maxTntTicksPerTick = getInt( "max-tnt-per-tick", 100 );
log( "Max TNT Explosions: " + maxTntTicksPerTick );
}
}