SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Spigot config initialization code into its own class, and use it for /reload.

Browse Source 
By: Aikar <aikar@aikar.co>
This commit is contained in:
Spigot
2013-01-21 21:46:53 -05:00
parent 4a73c45126
commit a0b9a93d01
4 changed files with 97 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
CraftBukkit-Patches/0021-Add-oreobfuscator-for-Spigot.patch
View File

@@ -1,4 +1,4 @@
From 651726d8d8d2b340212ad898826e88b1a0f7fd8e Mon Sep 17 00:00:00 2001
From c7846efa49cb600996091600a7295c3bb92b1e74 Mon Sep 17 00:00:00 2001
From: lishid <lishid@gmail.com>
Date: Mon, 21 Jan 2013 16:59:04 +1100
Subject: [PATCH] Add oreobfuscator for Spigot.
@@ -8,11 +8,12 @@ Subject: [PATCH] Add oreobfuscator for Spigot.
.../net/minecraft/server/Packet51MapChunk.java | 1 +
.../net/minecraft/server/Packet56MapChunkBulk.java | 21 ++++-
.../minecraft/server/PlayerInteractManager.java | 5 ++
.../java/org/bukkit/craftbukkit/CraftServer.java | 9 +++
.../java/org/bukkit/craftbukkit/CraftServer.java | 5 ++
.../java/org/bukkit/craftbukkit/CraftWorld.java | 4 +
.../bukkit/craftbukkit/OrebfuscatorManager.java | 93 ++++++++++++++++++++++
src/main/java/org/bukkit/craftbukkit/Spigot.java | 4 +
src/main/resources/configurations/bukkit.yml | 5 ++
8 files changed, 138 insertions(+), 1 deletion(-)
9 files changed, 138 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/OrebfuscatorManager.java
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
@@ -109,7 +110,7 @@ index 5faee12..55f9ffa 100644
if (false) { // Never trigger
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 047378a..4a75fb1 100644
index b8e9085..dac1cb7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -163,6 +163,11 @@ public final class CraftServer implements Server {
@@ -124,17 +125,6 @@ index 047378a..4a75fb1 100644
private final class BooleanWrapper {
private boolean value = true;
}
@@ -242,6 +247,10 @@ public final class CraftServer implements Server {
commandComplete = configuration.getBoolean("settings.command-complete", true);
spamGuardExclusions = configuration.getStringList("settings.spam-exclusions");
+ orebfuscatorEnabled = configuration.getBoolean("orebfuscator.enable", false);
+ orebfuscatorUpdateRadius = configuration.getInt("orebfuscator.update-radius", 2);
+ orebfuscatorDisabledWorlds = configuration.getStringList("orebfuscator.disabled-worlds");
+
org.bukkit.craftbukkit.util.LightningSimulator.configure(configuration);
try {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 856307f..4861609 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -263,6 +253,21 @@ index 0000000..6d5a519
+ || areAjacentBlocksTransparent(world, x, y, z - 1, radius - 1)));
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 2b0362a..b6a8d9e 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -24,6 +24,10 @@ public class Spigot {
server.commandComplete = configuration.getBoolean("settings.command-complete", true);
server.spamGuardExclusions = configuration.getStringList("settings.spam-exclusions");
+ server.orebfuscatorEnabled = configuration.getBoolean("orebfuscator.enable", false);
+ server.orebfuscatorUpdateRadius = configuration.getInt("orebfuscator.update-radius", 2);
+ server.orebfuscatorDisabledWorlds = configuration.getStringList("orebfuscator.disabled-worlds");
+
org.bukkit.craftbukkit.util.LightningSimulator.configure(configuration);
}
}
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index c41fac1..fee0bb1 100644
--- a/src/main/resources/configurations/bukkit.yml
@@ -277,5 +282,5 @@ index c41fac1..fee0bb1 100644
+ disabled-worlds:
+ - world_the_end
--
1.8.1-rc2
1.8.0.3