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

Allow orebfuscated blocks to be specified by the server admin.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-03-23 10:58:55 +11:00
parent 33b3ecf9d2
commit ba7d059f41
5 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CraftBukkit-Patches/0026-Watchdog-Thread.patch
View File

@@ -1,4 +1,4 @@
From 64483fc7a96665193fea41e27500fa1eee4eeaeb Mon Sep 17 00:00:00 2001
From 9fff54f533fad7006a63b3f739bcb4c7b0fc9760 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.
@@ -34,7 +34,7 @@ index 28135f4..3689a3d 100644
this.isStopped = true;
} catch (Throwable throwable1) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 8df3ca5..4b355c9 100644
index b00c885..dcfac79 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,5 +1,6 @@
@@ -65,7 +65,7 @@ index 8df3ca5..4b355c9 100644
server.whitelistMessage = configuration.getString("settings.whitelist-message", server.whitelistMessage);
server.stopMessage = configuration.getString("settings.stop-message", server.stopMessage);
@@ -31,12 +35,23 @@ public class Spigot {
@@ -31,13 +35,24 @@ public class Spigot {
server.commandComplete = configuration.getBoolean("settings.command-complete", true);
server.spamGuardExclusions = configuration.getStringList("settings.spam-exclusions");
@@ -84,13 +84,14 @@ index 8df3ca5..4b355c9 100644
server.orebfuscatorEngineMode = configuration.getInt("orebfuscator.engine-mode", 1);
server.orebfuscatorUpdateRadius = configuration.getInt("orebfuscator.update-radius", 2);
server.orebfuscatorDisabledWorlds = configuration.getStringList("orebfuscator.disabled-worlds");
server.orebfuscatorBlocks = configuration.getShortList("orebfuscator.blocks");
if (server.orebfuscatorEngineMode != 1 && server.orebfuscatorEngineMode != 2) {
- server.orebfuscatorEngineMode = 1;
+ server.orebfuscatorEngineMode = 1;
}
if (server.chunkGCPeriod == 0) {
@@ -264,4 +279,63 @@ public class Spigot {
@@ -265,4 +280,63 @@ public class Spigot {
SpigotTimings.checkIfActiveTimer.stopTiming();
return isActive;
}
@@ -283,7 +284,7 @@ index 0000000..10390b8
+ }
+}
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index 24808be..c7014fa 100644
index b741e37..ab8c5d6 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -31,6 +31,9 @@ settings: