Fix loading of per world settings

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-06-15 22:01:15 +10:00
parent 07e9933928
commit 925012dc60
10 changed files with 98 additions and 65 deletions

View File

@@ -1,4 +1,4 @@
From 19439295ea5c0088c27ca8a637ef9a252611ea63 Mon Sep 17 00:00:00 2001
From 409e7ab18c0ad7edb1b5f5a401a4398df325075d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 13:55:57 +1000
Subject: [PATCH] Spigot Changes
@@ -143,7 +143,7 @@ index 8339a35..c17ce36 100644
if (l < 7) {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f1c2d48..e1872cc 100644
index 018c314..f6885d6 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -845,8 +845,20 @@ public class PlayerConnection extends Connection {
@@ -299,7 +299,7 @@ index 2956e75..c234cac 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/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d28a4c8..ce7f93a 100644
index a9b4e71..9789ba4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -69,6 +69,17 @@ public class CraftWorld implements World {
@@ -319,8 +319,8 @@ index d28a4c8..ce7f93a 100644
+ public int mushroomGrowthModifier = 100;
// Spigot end
public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
@@ -94,16 +105,46 @@ public class CraftWorld implements World {
// Spigot start
@@ -93,16 +104,46 @@ public class CraftWorld implements World {
// Load defaults first
boolean info = configuration.getBoolean( "world-settings.default.info", true );
growthPerTick = configuration.getInt( "world-settings.default.growth-chunks-per-tick", growthPerTick );