Move getDouble into the Spigot Configuration patch

This commit is contained in:
Thinkofdeath 2014-07-26 18:03:45 +01:00
parent 33d758773e
commit b5dd202af1
20 changed files with 68 additions and 68 deletions

View file

@ -1,4 +1,4 @@
From 82e2f49e329e071961e4d038dd4ba0b53fc3354b Mon Sep 17 00:00:00 2001
From ab8cf22b485a1b484a4c5d442a48d7005ce9bf2e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -96,10 +96,10 @@ index eb0b342..d997b48 100644
int pollCount = 0;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
new file mode 100644
index 0000000..a4de4e9
index 0000000..f662b81
--- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +1,132 @@
@@ -0,0 +1,138 @@
+package org.spigotmc;
+
+import com.google.common.base.Throwables;
@ -231,6 +231,12 @@ index 0000000..a4de4e9
+ config.addDefault( path, def );
+ return config.getString( path, config.getString( path ) );
+ }
+
+ private static double getDouble(String path, double def)
+ {
+ config.addDefault( path, def );
+ return config.getDouble( path, config.getDouble( path ) );
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
new file mode 100644

View file

@ -1,4 +1,4 @@
From e4d653c817804d7137041f0ec46ef7e53edaae16 Mon Sep 17 00:00:00 2001
From abe67ad73f7f5c0d156def0bec08583d78a823d3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
@ -18,12 +18,12 @@ index 9596da2..3a24fcd 100644
CraftPlayer player = this.getPlayer();
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index dc4d4b3..a83ee05 100644
index 6dfa8b0..c9e6dc5 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -142,4 +142,10 @@ public class SpigotConfig
@@ -148,4 +148,10 @@ public class SpigotConfig
config.addDefault( path, def );
return config.getString( path, config.getString( path ) );
return config.getDouble( path, config.getDouble( path ) );
}
+
+ public static boolean logCommands;

View file

@ -1,4 +1,4 @@
From 6aa54c92a9f973fb3dc8d54bb69d6d9ade4962b3 Mon Sep 17 00:00:00 2001
From 42d2418969eb65f19fbd37e70ce1d614c60c052d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
@ -23,10 +23,10 @@ index 6dc4157..fdac2f6 100644
try {
completions = getCommandMap().tabComplete(player, message.substring(1));
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index a83ee05..f8427ed 100644
index c9e6dc5..f611334 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -148,4 +148,21 @@ public class SpigotConfig
@@ -154,4 +154,21 @@ public class SpigotConfig
{
logCommands = getBoolean( "commands.log", true );
}

View file

@ -1,4 +1,4 @@
From 38a904acda80377fc8e29f41d58b6c1ef0ab81ef Mon Sep 17 00:00:00 2001
From 5831308359be4561f282629032c081d3fee9187d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@ -62,7 +62,7 @@ index fdac2f6..f8e2f0f 100644
return false;
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index f8427ed..7a69092 100644
index f611334..4a89e70 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -12,6 +12,7 @@ import java.util.Map;
@ -73,7 +73,7 @@ index f8427ed..7a69092 100644
import org.bukkit.command.Command;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -165,4 +166,28 @@ public class SpigotConfig
@@ -171,4 +172,28 @@ public class SpigotConfig
}
tabComplete = getInt( "commands.tab-complete", 0 );
}

View file

@ -1,4 +1,4 @@
From ff6344c0774b53cff9aad1ae27f5d437c094194c Mon Sep 17 00:00:00 2001
From a61d90ceed82dc76e66df3c116a17812d46c0f14 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.
@ -155,10 +155,10 @@ index 0000000..429c258
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 7a69092..d7e2087 100644
index 4a89e70..069111c 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -190,4 +190,18 @@ public class SpigotConfig
@@ -196,4 +196,18 @@ public class SpigotConfig
outdatedClientMessage = transform( getString( "messages.outdated-client", outdatedClientMessage ) );
outdatedServerMessage = transform( getString( "messages.outdated-server", outdatedServerMessage ) );
}

View file

@ -1,4 +1,4 @@
From 5943bb9bacef23b3c665d77a64d09c9cbf7ecf16 Mon Sep 17 00:00:00 2001
From a56bb5f57e745406cdfefe109f24b0baa69c14e5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -192,10 +192,10 @@ index a77b2d9..e030666 100644
{
return getHandle().collidesWithEntities;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index d7e2087..8da7267 100644
index 069111c..7a0cb86 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -204,4 +204,14 @@ public class SpigotConfig
@@ -210,4 +210,14 @@ public class SpigotConfig
commands.put( "restart", new RestartCommand( "restart" ) );
WatchdogThread.doStart( timeoutTime, restartOnCrash );
}

View file

@ -1,4 +1,4 @@
From 0f023ad8b4a2833d951bc18f4143d910b5331f9e Mon Sep 17 00:00:00 2001
From 105366bb94604401f282fc67e147eda4e8acfa8d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:58:58 +1100
Subject: [PATCH] Configurable Amount of Netty Threads
@ -37,10 +37,10 @@ index 256d2f9..b0157b2 100644
public boolean ak() {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 8da7267..978dd41 100644
index 7a0cb86..59ba766 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -214,4 +214,11 @@ public class SpigotConfig
@@ -220,4 +220,11 @@ public class SpigotConfig
}
bungee = getBoolean( "settings.bungeecord", false );
}

View file

@ -1,4 +1,4 @@
From e2f43bd061323dff313a481882f3bdfacc39c807 Mon Sep 17 00:00:00 2001
From 92b21f9ef0a89a048ca93cba9c5fb45ac18a5bf7 Mon Sep 17 00:00:00 2001
From: slide23 <me@slide.ws>
Date: Fri, 20 Dec 2013 20:15:33 -0600
Subject: [PATCH] Add Late Bind Option
@ -43,10 +43,10 @@ index 58e68da..6ba9c8c 100644
}
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 978dd41..6ced245 100644
index 59ba766..bfe4ec4 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -221,4 +221,9 @@ public class SpigotConfig
@@ -227,4 +227,9 @@ public class SpigotConfig
System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) );
Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count );
}

View file

@ -1,4 +1,4 @@
From fcdc855e137daf7137d7cf5c7fc571650699641f Mon Sep 17 00:00:00 2001
From f0a5755b33168011d5877173caa3dd7f74bb531b Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced
@ -40,7 +40,7 @@ index 57a501f..cea31ae 100644
super.setStatistic(entityhuman, statistic, i);
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6ced245..e6709a8 100644
index bfe4ec4..47ab784 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -10,10 +10,12 @@ import java.util.HashMap;
@ -56,7 +56,7 @@ index 6ced245..e6709a8 100644
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -226,4 +228,31 @@ public class SpigotConfig
@@ -232,4 +234,31 @@ public class SpigotConfig
private static void lateBind() {
lateBind = getBoolean( "settings.late-bind", false );
}

View file

@ -1,4 +1,4 @@
From f6ccc2acaa06c9fdbee90a4a05f40e39fd9160bc Mon Sep 17 00:00:00 2001
From 53dea46c4a46b8998583667842605940ba7dff52 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 25 Jan 2014 14:08:35 +1100
Subject: [PATCH] Highly Optimized Tick Loop
@ -96,10 +96,10 @@ index 622e522..d6cd151 100644
this.a((CrashReport) null);
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index e6709a8..3f45433 100644
index 47ab784..2bc1a32 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -255,4 +255,9 @@ public class SpigotConfig
@@ -261,4 +261,9 @@ public class SpigotConfig
"screen." );
}
}

View file

@ -1,4 +1,4 @@
From f38d99e335046f768b3290c5d1fadf55264246a3 Mon Sep 17 00:00:00 2001
From 1d464b091b93eea701172cab120c0da261ba9cd7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 26 Jan 2014 21:48:34 +1100
Subject: [PATCH] Configurable Ping Sample Size
@ -23,10 +23,10 @@ index cd06305..6423aec 100644
ServerPing ping = new ServerPing();
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 3f45433..2c2b978 100644
index 2bc1a32..4ae5640 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -260,4 +260,11 @@ public class SpigotConfig
@@ -266,4 +266,11 @@ public class SpigotConfig
{
commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
}

View file

@ -1,4 +1,4 @@
From e257758ec7cd89c470020e8c94a779f2dbac6ff3 Mon Sep 17 00:00:00 2001
From cf59912111e18b258869e27d5a8f967bab88cd72 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 27 Jan 2014 08:39:26 +1100
Subject: [PATCH] Add Optional Tick Shuffling
@ -24,10 +24,10 @@ index c2194af..1d7b814 100644
while (iterator.hasNext()) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 2c2b978..86d5aef 100644
index 4ae5640..153fb4f 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -267,4 +267,10 @@ public class SpigotConfig
@@ -273,4 +273,10 @@ public class SpigotConfig
playerSample = getInt( "settings.sample-count", 12 );
System.out.println( "Server Ping Player Sample Count: " + playerSample );
}

View file

@ -1,4 +1,4 @@
From 4405b77da01a88df751e3fa095a8c71a5587c34d Mon Sep 17 00:00:00 2001
From e16be3049893341d18a6c0ba4abba5cdedc1288a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
@ -30,7 +30,7 @@ index 1ee5541..79d8fe0 100644
Waitable waitable = new Waitable() {
@Override
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 86d5aef..44eea2e 100644
index 153fb4f..ff86680 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,7 @@ import java.io.IOException;
@ -41,7 +41,7 @@ index 86d5aef..44eea2e 100644
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -273,4 +274,13 @@ public class SpigotConfig
@@ -279,4 +280,13 @@ public class SpigotConfig
{
playerShuffle = getInt( "settings.player-shuffle", 0 );
}

View file

@ -1,4 +1,4 @@
From 0412ea4638d13ea54656ca0e065e4d225e8810df Mon Sep 17 00:00:00 2001
From 47c86b88304e1040cea5fe21d0126ecfe1607a2d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 9 Feb 2014 14:39:01 +1100
Subject: [PATCH] Add Option to Silence CommandBlock Console
@ -18,10 +18,10 @@ index 0644276..84bcca1 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 44eea2e..6b5ee89 100644
index ff86680..731f24d 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -283,4 +283,10 @@ public class SpigotConfig
@@ -289,4 +289,10 @@ public class SpigotConfig
"/skill"
} ) );
}

View file

@ -1,4 +1,4 @@
From 17e5b3a2a2c8d269191bef5889d5cab3930dfa03 Mon Sep 17 00:00:00 2001
From 72c9d24c155fb244022930143b9c7a50ed5a7e33 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 18:18:01 +1100
Subject: [PATCH] Allow Disabling Creative Item Filter
@ -18,10 +18,10 @@ index 79d8fe0..c9e99e9 100644
// CraftBukkit start - Call click event
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6b5ee89..6957c17 100644
index 731f24d..05c2e43 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -289,4 +289,10 @@ public class SpigotConfig
@@ -295,4 +295,10 @@ public class SpigotConfig
{
silentCommandBlocks = getBoolean( "commands.silent-commandblock-console", false );
}

View file

@ -1,4 +1,4 @@
From 718444f59ba9e5c79de3303a8adfd6ea27033a49 Mon Sep 17 00:00:00 2001
From 63d21afebaad4e4c79d0aef482aaffa53d07c1fc Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 12 Feb 2014 20:44:14 +0000
Subject: [PATCH] Allow vanilla commands to be the main version of a command
@ -138,7 +138,7 @@ index 5a08283..a235ce8 100644
private void loadPlugin(Plugin plugin) {
try {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6957c17..e4ee00e 100644
index 05c2e43..a299317 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -8,8 +8,10 @@ import java.lang.reflect.Method;
@ -152,7 +152,7 @@ index 6957c17..e4ee00e 100644
import java.util.logging.Level;
import net.minecraft.util.gnu.trove.map.hash.TObjectIntHashMap;
import net.minecraft.server.MinecraftServer;
@@ -295,4 +297,16 @@ public class SpigotConfig
@@ -301,4 +303,16 @@ public class SpigotConfig
{
filterCreativeItems = getBoolean( "settings.filter-creative-items", true );
}

View file

@ -1,4 +1,4 @@
From a94aa2dba8b3ecc27d927b1e00f3f96b0f023d51 Mon Sep 17 00:00:00 2001
From f75e039f6c518a941df3776e908f7514811f7735 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Fri, 25 Apr 2014 18:17:30 -0400
Subject: [PATCH] Configurable UserCache cap
@ -18,10 +18,10 @@ index bbbcc86..4aea9df 100644
try {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index e4ee00e..2bc7333 100644
index a299317..8e4e7db 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -309,4 +309,10 @@ public class SpigotConfig
@@ -315,4 +315,10 @@ public class SpigotConfig
replaceCommands = new HashSet<String>( (List<String>) getList( "commands.replace-commands",
Arrays.asList( "setblock", "summon", "testforblock", "tellraw" ) ) );
}

View file

@ -1,4 +1,4 @@
From afe5d1add1923aecd3289046a591aefde8dad050 Mon Sep 17 00:00:00 2001
From 7dc1f068b6c90964f26369166eb327f4f8c99ef5 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Fri, 23 May 2014 18:05:10 -0400
Subject: [PATCH] Configurable save-on-stop-only for UserCache
@ -36,10 +36,10 @@ index 4aea9df..9f7de3f 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 2bc7333..00b7cad 100644
index 8e4e7db..46c8573 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -315,4 +315,10 @@ public class SpigotConfig
@@ -321,4 +321,10 @@ public class SpigotConfig
{
userCacheCap = getInt( "settings.user-cache-size", 1000 );
}

View file

@ -1,4 +1,4 @@
From 8185f67c84b9f107d829c9c3757e28dc0fcba478 Mon Sep 17 00:00:00 2001
From 628eb5c0b3c5bebc8af321ee4ff7a9bb69ae636c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 20 Jun 2014 19:40:00 +1000
Subject: [PATCH] Prevent Unbounded IntCache Growth
@ -43,10 +43,10 @@ index 9858720..47e06df 100644
}
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 00b7cad..7998aac 100644
index 46c8573..429ad36 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -321,4 +321,10 @@ public class SpigotConfig
@@ -327,4 +327,10 @@ public class SpigotConfig
{
saveUserCacheOnStopOnly = getBoolean( "settings.save-user-cache-on-stop-only", false );
}

View file

@ -1,11 +1,11 @@
From e35aba69f6f81ed0fc880859d4e22a0bf1e87754 Mon Sep 17 00:00:00 2001
From 0dc42bba2be3d717021f9b0b2333b40eec3429f0 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Fri, 4 Jul 2014 23:03:13 +0200
Subject: [PATCH] Make "moved wrongly" limit configurable
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 9a7b256..f064f6e 100644
index 20c49e3..cd4f0c9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -399,7 +399,8 @@ public class PlayerConnection implements PacketPlayInListener {
@ -19,20 +19,14 @@ index 9a7b256..f064f6e 100644
c.warn(this.player.getName() + " moved wrongly!");
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 7998aac..2e6e172 100644
index 429ad36..6a230f9 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -327,4 +327,16 @@ public class SpigotConfig
@@ -333,4 +333,10 @@ public class SpigotConfig
{
intCacheLimit = getInt( "settings.int-cache-limit", 1024 );
}
+
+ private static double getDouble(String path, double def)
+ {
+ config.addDefault( path, def );
+ return config.getDouble( path, config.getDouble( path ) );
+ }
+
+ public static double movedWronglyThreshold;
+ private static void movedWronglyThreshold()
+ {