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

Fix loading of per world settings

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0019-Orebfuscator.patch
View File

@@ -1,4 +1,4 @@
From c5c93da98f2055551632763b1047a312a47424fa Mon Sep 17 00:00:00 2001
From 26e5d69d816014435a7d10f9f94af52aaafc50a1 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
@@ -107,7 +107,7 @@ index 1243d1d..e45bcd2 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6ed5212..ff929e4 100644
index c234cac..82dfef1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -163,6 +163,12 @@ public final class CraftServer implements Server {
@@ -124,7 +124,7 @@ index 6ed5212..ff929e4 100644
private boolean value = true;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c1ef7ab..e8cd8bf 100644
index 4d022bd..0a39ed3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -84,6 +84,7 @@ public class CraftWorld implements World {
@@ -134,8 +134,8 @@ index c1ef7ab..e8cd8bf 100644
+ public boolean obfuscated = false;
// Spigot end
public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
@@ -140,6 +141,7 @@ public class CraftWorld implements World {
// Spigot start
@@ -139,6 +140,7 @@ public class CraftWorld implements World {
viewDistance = Bukkit.getServer().getViewDistance();
viewDistance = configuration.getInt( "world-settings." + name + ".view-distance", viewDistance );
@@ -143,7 +143,7 @@ index c1ef7ab..e8cd8bf 100644
if ( info )
{
@@ -159,6 +161,7 @@ public class CraftWorld implements World {
@@ -158,6 +160,7 @@ public class CraftWorld implements World {
server.getLogger().info( "Item Merge Radius: " + itemMergeRadius );
server.getLogger().info( "Exp Merge Radius: " + expMergeRadius );
server.getLogger().info( "View distance: " + viewDistance );