Reset default antixray blocks to remove 1 and 5, to fix block lag people have being seeing. Thanks @andrewkm for the report.

This commit is contained in:
md_5 2013-07-13 11:37:21 +10:00
parent 855d97b89a
commit e881f8990f
22 changed files with 87 additions and 72 deletions

View File

@ -1,4 +1,4 @@
From 44f4c66981071f0c90253d9e08a5d7a57f63b9c0 Mon Sep 17 00:00:00 2001
From dacf797a6228808d2c39af537c53e394c35015df 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
@ -94,10 +94,10 @@ index 00326c1..8148f9b 100644
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
new file mode 100644
index 0000000..b7dbda4
index 0000000..358d5ec
--- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +1,114 @@
@@ -0,0 +1,120 @@
+package org.spigotmc;
+
+import com.google.common.base.Throwables;
@ -144,7 +144,8 @@ index 0000000..b7dbda4
+
+ commands = new HashMap<String, Command>();
+
+ version = getInt( "config-version", 1 );
+ version = getInt( "config-version", 2 );
+ set( "config-version", 2 );
+ readConfig( SpigotConfig.class, null );
+ }
+
@ -188,6 +189,11 @@ index 0000000..b7dbda4
+ }
+ }
+
+ private static void set(String path, Object val)
+ {
+ config.set( path, val );
+ }
+
+ private static boolean getBoolean(String path, boolean def)
+ {
+ config.addDefault( path, def );
@ -214,10 +220,10 @@ index 0000000..b7dbda4
+}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
new file mode 100644
index 0000000..3f8562f
index 0000000..961ddb4
--- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -0,0 +1,66 @@
@@ -0,0 +1,71 @@
+package org.spigotmc;
+
+import java.util.List;
@ -254,6 +260,11 @@ index 0000000..3f8562f
+ }
+ }
+
+ private void set(String path, Object val)
+ {
+ config.set( "world-settings.default." + path, val );
+ }
+
+ private boolean getBoolean(String path, boolean def)
+ {
+ config.addDefault( "world-settings.default." + path, def );

View File

@ -1,4 +1,4 @@
From fe19bcc370679630fa1d80fd36fd5d9e0fa07bab Mon Sep 17 00:00:00 2001
From e88612ecce87211e7d06cb37dc9cb17329bc3e68 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection
@ -148,10 +148,10 @@ index eb9540f..b073b90 100644
}
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 3f8562f..123fb7a 100644
index 961ddb4..478d9e6 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -63,4 +63,11 @@ public class SpigotWorldConfig
@@ -68,4 +68,11 @@ public class SpigotWorldConfig
config.addDefault( "world-settings.default." + path, def );
return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
}

View File

@ -1,4 +1,4 @@
From 33080e70fd655ca796ed9069fa2daef5bf71b8a3 Mon Sep 17 00:00:00 2001
From 89188699eec6514aae0bc53904a2fe8f732630bf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:17:20 +1000
Subject: [PATCH] Crop Growth Rates
@ -132,10 +132,10 @@ index f2d4e57..5fe0a81 100644
if (l < 7) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 123fb7a..3ec38a1 100644
index 478d9e6..1c598ed 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -70,4 +70,36 @@ public class SpigotWorldConfig
@@ -75,4 +75,36 @@ public class SpigotWorldConfig
chunksPerTick = getInt( "chunks-per-tick", 650 );
log( "Chunks to Grow per Tick: " + chunksPerTick );
}

View File

@ -1,4 +1,4 @@
From b775da9b4f2ff04d33eec48bcb45c5637f92dda5 Mon Sep 17 00:00:00 2001
From f87755a50f02b5c85c289b1cbb63b5333044c631 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:22:07 +1000
Subject: [PATCH] Proxy IP Filter
@ -67,10 +67,10 @@ index 0000000..55d8d12
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index b7dbda4..e4eaecd 100644
index 358d5ec..83696e9 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -111,4 +111,10 @@ public class SpigotConfig
@@ -117,4 +117,10 @@ public class SpigotConfig
config.addDefault( path, def );
return config.getString( path, config.getString( path ) );
}

View File

@ -1,4 +1,4 @@
From add74cc2f0f32f3fc3199fcc3b8054ffef974ad2 Mon Sep 17 00:00:00 2001
From 51dda8f0e8253d99806ada3cc33de13402f3504e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@ -69,10 +69,10 @@ index 8ac0e8e..0968ed8 100644
if (event != null && (event.isCancelled() || entity.dead)) {
entity.dead = true;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 3ec38a1..8a6d656 100644
index 1c598ed..610f753 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -102,4 +102,18 @@ public class SpigotWorldConfig
@@ -107,4 +107,18 @@ public class SpigotWorldConfig
wheatModifier = getInt( "growth.wheat-modifier", 100 );
log( "Wheat Growth Modifier: " + wheatModifier + "%" );
}

View File

@ -1,4 +1,4 @@
From 4507134ba87b783d290621344c31b154a441b4f6 Mon Sep 17 00:00:00 2001
From a400608cb3d78216f49772c1155e2e8c0a0f5490 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance
@ -32,10 +32,10 @@ index b073b90..1a34feb 100644
this.entitiesById = new IntHashMap();
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 8a6d656..c2da03b 100644
index 610f753..3e66d79 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -116,4 +116,11 @@ public class SpigotWorldConfig
@@ -121,4 +121,11 @@ public class SpigotWorldConfig
expMerge = getDouble("merge-radius.exp", 3.0 );
log( "Experience Merge Radius: " + expMerge );
}

View File

@ -1,4 +1,4 @@
From 9cc766f66a41723df6472db2ec244e418be7809d Mon Sep 17 00:00:00 2001
From b51ae5df5a86c36e57460ed23da469e615fa943e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 12:28:17 +1100
Subject: [PATCH] Highly Optimized Tick Loop
@ -117,7 +117,7 @@ index 0000000..f114a31
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index e4eaecd..7880a31 100644
index 83696e9..f97a80b 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -14,6 +14,7 @@ import net.minecraft.server.MinecraftServer;
@ -128,7 +128,7 @@ index e4eaecd..7880a31 100644
public class SpigotConfig
{
@@ -117,4 +118,9 @@ public class SpigotConfig
@@ -123,4 +124,9 @@ public class SpigotConfig
{
preventProxies = getBoolean( "settings.prevent-proxies", false );
}

View File

@ -1,4 +1,4 @@
From ba52e0a6ff1c2d470be5ad41e435bf422be98df4 Mon Sep 17 00:00:00 2001
From 68276a3d08af1b9ebe3cc824c77ff7216c10cf35 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 16 May 2013 18:51:05 +1000
Subject: [PATCH] Orebfuscator
@ -317,7 +317,7 @@ index 0000000..48c8a99
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index c2da03b..a788d8d 100644
index 3e66d79..f74fc9b 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -1,5 +1,6 @@
@ -327,7 +327,7 @@ index c2da03b..a788d8d 100644
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -123,4 +124,25 @@ public class SpigotWorldConfig
@@ -128,4 +129,29 @@ public class SpigotWorldConfig
viewDistance = getInt( "view-distance", Bukkit.getViewDistance() );
log( "View Distance: " + viewDistance );
}
@ -336,7 +336,7 @@ index c2da03b..a788d8d 100644
+ public int engineMode = 1;
+ public List<Integer> blocks = Arrays.asList( new Integer[]
+ {
+ 1, 5, 14, 15, 16, 21, 48, 49, 54, 56, 73, 74, 82, 129, 130
+ 14, 15, 16, 21, 48, 49, 54, 56, 73, 74, 82, 129, 130
+ } );
+ public AntiXray antiXrayInstance;
+ private void antiXray()
@ -347,9 +347,13 @@ index c2da03b..a788d8d 100644
+ engineMode = getInt( "anti-xray.engine-mode", engineMode );
+ log( "\tEngine Mode: " + engineMode );
+
+ if ( SpigotConfig.version < 2 )
+ {
+ set( "anti-xray.blocks", blocks );
+ }
+ blocks = getList( "anti-xray.blocks", blocks );
+ log( "\tBlocks: " + blocks );
+
+
+ antiXrayInstance = new AntiXray( this );
+ }
}

View File

@ -1,4 +1,4 @@
From e56ac55a6907c33ae13bab5e45eccb304212329d Mon Sep 17 00:00:00 2001
From fc91a1144c3a77270d6a1a6ea8eaf61fc7120153 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:29:54 +1000
Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@ -121,11 +121,11 @@ index 9812538..ecf13aa 100644
continue label110;
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index a788d8d..8bb0483 100644
index f74fc9b..f0becc1 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -145,4 +145,11 @@ public class SpigotWorldConfig
@@ -154,4 +154,11 @@ public class SpigotWorldConfig
antiXrayInstance = new AntiXray( this );
}
+

View File

@ -1,4 +1,4 @@
From 52d11a16d8ba74727a0f426df125d33ca3210240 Mon Sep 17 00:00:00 2001
From 56c2de96b7af0ca6ee5f229eb9be73cc098dcd10 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -462,10 +462,10 @@ index 0000000..9285a0d
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 8bb0483..eb721f5 100644
index f0becc1..e652a43 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -152,4 +152,15 @@ public class SpigotWorldConfig
@@ -161,4 +161,15 @@ public class SpigotWorldConfig
mobSpawnRange = (byte) getInt( "mob-spawn-range", 4 );
log( "Mob Spawn Range: " + mobSpawnRange );
}

View File

@ -1,4 +1,4 @@
From 7f0bdda393aa374b88418f13aa631f08467a3bf5 Mon Sep 17 00:00:00 2001
From 9b4f7770cae78ac23e89a6cb92bfcdac3517da6c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 08:58:35 +1100
Subject: [PATCH] Metrics
@ -657,7 +657,7 @@ index 0000000..f1690a2
+}
\ No newline at end of file
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 7880a31..3028526 100644
index f97a80b..b11499b 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -36,6 +36,7 @@ public class SpigotConfig
@ -668,7 +668,7 @@ index 7880a31..3028526 100644
public static void init()
{
@@ -55,6 +56,18 @@ public class SpigotConfig
@@ -56,6 +57,18 @@ public class SpigotConfig
{
MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() );
}

View File

@ -1,4 +1,4 @@
From 77856e37195b1779bdddeb9f3a2f14ae72a17961 Mon Sep 17 00:00:00 2001
From 431a8b84748f75df350e118e87348ae4d7f8b8a0 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.
@ -142,10 +142,10 @@ index 0000000..c8125c2
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 3028526..a0a7790 100644
index b11499b..a0d5047 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -136,4 +136,16 @@ public class SpigotConfig
@@ -142,4 +142,16 @@ public class SpigotConfig
{
commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
}

View File

@ -1,4 +1,4 @@
From 13da8d1098ec4326777b56ae4510a7bdee4e5de2 Mon Sep 17 00:00:00 2001
From f47ec3b81b2512a6904927307314c5100417a8f5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:06:29 +1000
Subject: [PATCH] Netty
@ -160,7 +160,7 @@ index c9e187e..b433c60 100644
this.b = true;
} catch (Exception exception) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index a0a7790..8efdca6 100644
index a0d5047..736ba25 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,8 @@ import java.io.IOException;
@ -172,7 +172,7 @@ index a0a7790..8efdca6 100644
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -148,4 +150,62 @@ public class SpigotConfig
@@ -154,4 +156,62 @@ public class SpigotConfig
commands.put( "restart", new RestartCommand( "restart" ) );
WatchdogThread.doStart( timeoutTime, restartOnCrash );
}

View File

@ -1,4 +1,4 @@
From 1c0cf95f3bd793cf1324bd3c115f2b865b310bbc Mon Sep 17 00:00:00 2001
From 2568db1a647428de77152407ba79ecedf145cb12 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Feb 2013 11:58:47 -0500
Subject: [PATCH] Entity Tracking Ranges
@ -24,10 +24,10 @@ index 7f23f71..7bb153c 100644
i = this.d;
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index eb721f5..820c576 100644
index e652a43..c590373 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -163,4 +163,19 @@ public class SpigotWorldConfig
@@ -172,4 +172,19 @@ public class SpigotWorldConfig
miscActivationRange = getInt( "entity-activation-range.misc", miscActivationRange );
log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Mi " + miscActivationRange );
}

View File

@ -1,4 +1,4 @@
From 232d9206c7764ad9d37012a0cf5e9e73c86d5241 Mon Sep 17 00:00:00 2001
From 99d17efe9c774886f0428e437ce375ee92409e49 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support
@ -75,7 +75,7 @@ index 5bf0e3c..8af2934 100644
public Spigot spigot()
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 8efdca6..a7bc48b 100644
index 736ba25..9a45d86 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -7,6 +7,7 @@ import java.lang.reflect.InvocationTargetException;
@ -86,7 +86,7 @@ index 8efdca6..a7bc48b 100644
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -208,4 +209,14 @@ public class SpigotConfig
@@ -214,4 +215,14 @@ public class SpigotConfig
nettyThreads = getInt( "settings.netty-threads", 3 );
}

View File

@ -1,4 +1,4 @@
From 6a194f0fd5d7713292bd492b62bc423c9eb1d3b1 Mon Sep 17 00:00:00 2001
From 2cf6628e342def4c05e46a6f30f7a067fefb155e Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sun, 2 Jun 2013 16:23:46 +1000
Subject: [PATCH] Hopper Cooldowns
@ -64,10 +64,10 @@ index e8cd525..44ddf35 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 820c576..56af938 100644
index c590373..51fcee0 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -178,4 +178,13 @@ public class SpigotWorldConfig
@@ -187,4 +187,13 @@ public class SpigotWorldConfig
maxTrackingRange = getInt( "entity-tracking-range.other", maxTrackingRange );
log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + maxTrackingRange );
}

View File

@ -1,4 +1,4 @@
From 8ed7645ee2ea113964e3dbe13f7a79e1cdd0b673 Mon Sep 17 00:00:00 2001
From 61c17d644c48969e486ebb8aec1d92bdad6850ee Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:59:22 +1000
Subject: [PATCH] Spam Filter Exclusions
@ -28,10 +28,10 @@ index 40ea712..f1a4dfe 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 a7bc48b..a3d3a7b 100644
index 9a45d86..1ec9272 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -219,4 +219,13 @@ public class SpigotConfig
@@ -225,4 +225,13 @@ public class SpigotConfig
bungeeAddresses = getList( "settings.bungeecord-addresses", bungeeAddresses );
bungee = getBoolean( "settings.bungeecord", true );
}

View File

@ -1,4 +1,4 @@
From d26ad9c01872c1c66b3016178723d2daa757594a Mon Sep 17 00:00:00 2001
From 3dc8ca3c302fe1dc2593f82a5109f3f71e16882f 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
@ -23,10 +23,10 @@ index f1a4dfe..34613dc 100644
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
return;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index a3d3a7b..0188a98 100644
index 1ec9272..d64eb0b 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -228,4 +228,10 @@ public class SpigotConfig
@@ -234,4 +234,10 @@ public class SpigotConfig
"/skill"
} ) );
}

View File

@ -1,4 +1,4 @@
From 4a2d3297a65394d245d4698f0e55efd9afe152e9 Mon Sep 17 00:00:00 2001
From b732df22b226d93edbe2f508d50c0124565b2821 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
@ -18,10 +18,10 @@ index a1fe1f2..f356538 100644
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 0188a98..fff8c02 100644
index d64eb0b..e1b8fc0 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -234,4 +234,10 @@ public class SpigotConfig
@@ -240,4 +240,10 @@ public class SpigotConfig
{
logCommands = getBoolean( "commands.log", true );
}

View File

@ -1,4 +1,4 @@
From c799d9808a710a302b625606f44280187770c6ee Mon Sep 17 00:00:00 2001
From 0d94faf97bf904cbac94131787bf01974ae58f64 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
@ -40,7 +40,7 @@ index f356538..100396f 100644
return false;
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index fff8c02..d2058f3 100644
index e1b8fc0..106b392 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -15,6 +15,7 @@ import java.util.Map;
@ -51,7 +51,7 @@ index fff8c02..d2058f3 100644
import org.bukkit.command.Command;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
@@ -240,4 +241,18 @@ public class SpigotConfig
@@ -246,4 +247,18 @@ public class SpigotConfig
{
tabComplete = getBoolean( "commands.tab-complete", true );
}

View File

@ -1,4 +1,4 @@
From eb368d6de6c2c1a2a0e2fa54decea60436a93ba6 Mon Sep 17 00:00:00 2001
From 2167301a27f90e52528e292a67f90897c3239764 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates
@ -18,10 +18,10 @@ index 211127b..8bd7876 100644
entityhuman = (EntityHuman) this.players.get(i);
j = MathHelper.floor(entityhuman.locX) + this.random.nextInt(11) - 5;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 56af938..d6d957c 100644
index 51fcee0..988f7eb 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -187,4 +187,11 @@ public class SpigotWorldConfig
@@ -196,4 +196,11 @@ public class SpigotWorldConfig
hopperTransfer = getInt( "ticks-per.hopper-transfer", hopperTransfer );
log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck );
}

View File

@ -1,4 +1,4 @@
From 333ebc94506b39257d9b2fe719f4b7ece697154c Mon Sep 17 00:00:00 2001
From 28a75384a6b40fa9a6d1451bcbe3f5351ca3e39d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:40:11 +1000
Subject: [PATCH] Add Log Filtering
@ -35,7 +35,7 @@ index 0000000..aa7e9ab
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index d2058f3..e8039d7 100644
index 106b392..c2d033c 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -13,6 +13,8 @@ import java.util.HashMap;
@ -47,7 +47,7 @@ index d2058f3..e8039d7 100644
import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -255,4 +257,27 @@ public class SpigotConfig
@@ -261,4 +263,27 @@ public class SpigotConfig
unknownCommandMessage = transform( getString( "messages.unknown-command", "Unknown command. Type \"help\" for help." ) );
serverFullMessage = transform( getString( "messages.server-full", "The server is full!" ) );
}