SteamWar/Paper
11
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

14
CraftBukkit-Patches/0022-Entity-Activation-Range.patch
View File

@@ -1,4 +1,4 @@
From 2a3ea7b58eb897de61764939ca9093abc337fb1c Mon Sep 17 00:00:00 2001
From 10dfc516e19948d48c68ab9ff6d9452584f50a22 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
@@ -118,7 +118,7 @@ index 58a4acb..35f3fea 100644
public EntityLiving(World world) {
super(world);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c91b9df..1120ffd 100644
index a680f89..6be7e96 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
@@ -154,7 +154,7 @@ index c91b9df..1120ffd 100644
entity.V = entity.locY;
entity.W = entity.locZ;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e8cd8bf..2f9d859 100644
index 0a39ed3..ebf1a67 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -85,6 +85,10 @@ public class CraftWorld implements World {
@@ -167,8 +167,8 @@ index e8cd8bf..2f9d859 100644
+ public int monsterEntityActivationRange = 32;
// Spigot end
public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
@@ -120,8 +124,11 @@ public class CraftWorld implements World {
// Spigot start
@@ -119,8 +123,11 @@ public class CraftWorld implements World {
sugarGrowthModifier = configuration.getInt( "world-settings.default.sugar-growth-modifier", sugarGrowthModifier );
treeGrowthModifier = configuration.getInt( "world-settings.default.tree-growth-modifier", treeGrowthModifier );
mushroomGrowthModifier = configuration.getInt( "world-settings.default.mushroom-growth-modifier", mushroomGrowthModifier );
@@ -182,7 +182,7 @@ index e8cd8bf..2f9d859 100644
// Override defaults with world specific, if they exist
info = configuration.getBoolean( "world-settings." + name + ".info", info );
@@ -136,8 +143,11 @@ public class CraftWorld implements World {
@@ -135,8 +142,11 @@ public class CraftWorld implements World {
sugarGrowthModifier = configuration.getInt( "world-settings." + name + ".sugar-growth-modifier", sugarGrowthModifier );
treeGrowthModifier = configuration.getInt( "world-settings." + name + ".tree-growth-modifier", treeGrowthModifier );
mushroomGrowthModifier = configuration.getInt( "world-settings." + name + ".mushroom-growth-modifier", mushroomGrowthModifier );
@@ -196,7 +196,7 @@ index e8cd8bf..2f9d859 100644
viewDistance = Bukkit.getServer().getViewDistance();
viewDistance = configuration.getInt( "world-settings." + name + ".view-distance", viewDistance );
@@ -162,6 +172,7 @@ public class CraftWorld implements World {
@@ -161,6 +171,7 @@ public class CraftWorld implements World {
server.getLogger().info( "Exp Merge Radius: " + expMergeRadius );
server.getLogger().info( "View distance: " + viewDistance );
server.getLogger().info( "Orebfuscator: " + obfuscated );