Allow orebfuscated blocks to be specified by the server admin.

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

View File

@@ -1,4 +1,4 @@
From aa8040ec37080586df5f64493f42381b37661bf8 Mon Sep 17 00:00:00 2001
From ec5887e4dec30708a0c515ce5a2e70cde34b7532 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
@@ -173,7 +173,7 @@ index fbab028..80762c1 100644
public Block getBlockAt(int x, int y, int z) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index ad65bca..8012ff8 100644
index 4097568..705daef 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,9 +1,17 @@
@@ -194,7 +194,7 @@ index ad65bca..8012ff8 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -26,5 +34,216 @@ public class Spigot {
@@ -27,5 +35,216 @@ public class Spigot {
if (server.chunkGCPeriod == 0) {
server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
}
@@ -426,7 +426,7 @@ index bbb6368..d8f73ad 100644
public static final HashMap<String, CustomTimingsHandler> tileEntityTypeTimingMap = new HashMap<String, CustomTimingsHandler>();
public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>();
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index 6c21ca2..24808be 100644
index f0d731f..b741e37 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -46,6 +46,9 @@ world-settings: