From 2747aa6e49fadf7c5361a3a1fd3e32952c0dff42 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 15 Jun 2013 22:01:15 +1000 Subject: [PATCH] Fix loading of per world settings --- .../0004-Spigot-Configuration.patch | 53 +++++++++++++++---- .../0005-Better-Chunk-Tick-Selection.patch | 16 +++--- CraftBukkit-Patches/0006-Spigot-Changes.patch | 10 ++-- .../0010-Merge-tweaks-and-configuration.patch | 14 ++--- .../0012-Async-Operation-Catching.patch | 12 ++--- CraftBukkit-Patches/0013-View-Distance.patch | 12 ++--- CraftBukkit-Patches/0019-Orebfuscator.patch | 12 ++--- .../0022-Entity-Activation-Range.patch | 14 ++--- .../0033-Entity-Tracking-Ranges.patch | 12 ++--- CraftBukkit-Patches/0050-Particle-API.patch | 8 +-- 10 files changed, 98 insertions(+), 65 deletions(-) diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch index 4b64eab6a..5e8b5ec24 100644 --- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 23604895a4c7e1eeb6ae4dc364ba42630403f2d9 Mon Sep 17 00:00:00 2001 +From 5e6688239dff8fcd5dc6187df2d622baa32cf284 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 14 May 2013 12:06:27 +1000 Subject: [PATCH] Spigot Configuration @@ -25,6 +25,28 @@ index 7261dc9..10ce69d 100644 if (!this.getOnlineMode()) { this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index 3a4ddea..18dc536 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -111,7 +111,7 @@ public abstract class World implements IBlockAccess { + // Changed signature + public World(IDataManager idatamanager, String s, WorldSettings worldsettings, WorldProvider worldprovider, MethodProfiler methodprofiler, IConsoleLogManager iconsolelogmanager, ChunkGenerator gen, org.bukkit.World.Environment env) { + this.generator = gen; +- this.world = new CraftWorld((WorldServer) this, gen, env); ++ this.world = new CraftWorld((WorldServer) this, gen, env, s); // Spigot + this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit + this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit + // CraftBukkit end +@@ -123,7 +123,7 @@ public abstract class World implements IBlockAccess { + this.methodProfiler = methodprofiler; + this.worldMaps = new WorldMapCollection(idatamanager); + this.logAgent = iconsolelogmanager; +- this.worldData = idatamanager.getWorldData(); ++ // this.worldData = idatamanager.getWorldData(); + if (worldprovider != null) { + this.worldProvider = worldprovider; + } else if (this.worldData != null && this.worldData.j() != 0) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 6cb50b7..2956e75 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -39,23 +61,32 @@ index 6cb50b7..2956e75 100644 private final Map offlinePlayers = new MapMaker().softValues().makeMap(); private final AutoUpdater updater; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c0fb528..430a9c0 100644 +index c0fb528..e6fdbe5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -77,6 +77,30 @@ public class CraftWorld implements World { +@@ -67,8 +67,14 @@ public class CraftWorld implements World { + private int chunkGCTickCount; + + private static final Random rand = new Random(); +- ++ ++ // Spigot start + public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { ++ this( world, gen, env, "default" ); ++ } ++ ++ public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env, String name) { ++ // Spigot end + this.world = world; + this.generator = gen; + +@@ -77,6 +83,23 @@ public class CraftWorld implements World { if (server.chunkGCPeriod > 0) { chunkGCTickCount = rand.nextInt(server.chunkGCPeriod); } + // Spigot start + org.bukkit.configuration.file.YamlConfiguration configuration = server.configuration; -+ String name; -+ if ( world.worldData == null || world.worldData.getName() == null ) -+ { -+ name = "default"; -+ } else -+ { -+ name = world.worldData.getName().replaceAll( " ", "_" ); -+ } ++ name = name.replaceAll( " ", "_" ); + + // Load defaults first + boolean info = configuration.getBoolean( "world-settings.default.info", true ); diff --git a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch index 8a071065a..7971346d5 100644 --- a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch +++ b/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch @@ -1,11 +1,11 @@ -From b50024fe4c26652f55fcb2aa4f395130838e7a49 Mon Sep 17 00:00:00 2001 +From 7873268e59804d8bd9d73ea9ab45fb520655505a Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:56:02 +1000 Subject: [PATCH] Better Chunk Tick Selection diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3a4ddea..ddf84f8 100644 +index 18dc536..a58d626 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -66,13 +66,35 @@ public abstract class World implements IBlockAccess { @@ -148,20 +148,22 @@ index 49360c1..6c3fcf1 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 430a9c0..d28a4c8 100644 +index e6fdbe5..a9b4e71 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -67,6 +67,9 @@ public class CraftWorld implements World { +@@ -67,7 +67,10 @@ public class CraftWorld implements World { private int chunkGCTickCount; private static final Random rand = new Random(); +- + // Spigot start + public int growthPerTick = 650; + // Spigot end - ++ + // Spigot start public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { - this.world = world; -@@ -90,14 +93,17 @@ public class CraftWorld implements World { + this( world, gen, env, "default" ); +@@ -89,14 +92,17 @@ public class CraftWorld implements World { // Load defaults first boolean info = configuration.getBoolean( "world-settings.default.info", true ); diff --git a/CraftBukkit-Patches/0006-Spigot-Changes.patch b/CraftBukkit-Patches/0006-Spigot-Changes.patch index b200a8607..5ab15ffed 100644 --- a/CraftBukkit-Patches/0006-Spigot-Changes.patch +++ b/CraftBukkit-Patches/0006-Spigot-Changes.patch @@ -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 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 ); diff --git a/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch index a1b02761b..c264a46e6 100644 --- a/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From 244ca83b5d4a8556debfd1afb5af9e49900c8407 Mon Sep 17 00:00:00 2001 +From 6831f00ba246bbcbed11699e16076bb29ff81ddc Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration @@ -41,7 +41,7 @@ index 0225f53..294ab8f 100644 } } else { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7385c25..69799d9 100644 +index ba8f1de..964bef6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -955,6 +955,23 @@ public abstract class World implements IBlockAccess { @@ -69,7 +69,7 @@ index 7385c25..69799d9 100644 if (event != null && (event.isCancelled() || entity.dead)) { entity.dead = true; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ce7f93a..24230de 100644 +index 9789ba4..d0e6d6f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -80,6 +80,9 @@ public class CraftWorld implements World { @@ -81,8 +81,8 @@ index ce7f93a..24230de 100644 + public double expMergeRadius = 3.5; // Spigot end - public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -@@ -115,6 +118,8 @@ public class CraftWorld implements World { + // Spigot start +@@ -114,6 +117,8 @@ 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 ); @@ -91,7 +91,7 @@ index ce7f93a..24230de 100644 // Override defaults with world specific, if they exist info = configuration.getBoolean( "world-settings." + name + ".info", info ); -@@ -129,6 +134,8 @@ public class CraftWorld implements World { +@@ -128,6 +133,8 @@ 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 ); @@ -100,7 +100,7 @@ index ce7f93a..24230de 100644 if ( info ) { -@@ -145,6 +152,8 @@ public class CraftWorld implements World { +@@ -144,6 +151,8 @@ public class CraftWorld implements World { server.getLogger().info( "Sugar Growth Modifier: " + sugarGrowthModifier ); server.getLogger().info( "Tree Growth Modifier: " + treeGrowthModifier ); server.getLogger().info( "Mushroom Growth Modifier: " + mushroomGrowthModifier ); diff --git a/CraftBukkit-Patches/0012-Async-Operation-Catching.patch b/CraftBukkit-Patches/0012-Async-Operation-Catching.patch index 805808d3d..3e049c90d 100644 --- a/CraftBukkit-Patches/0012-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0012-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From b99e7e04906d22b535abf86fd97b7e30616a1999 Mon Sep 17 00:00:00 2001 +From a25d375917c5154237f18b2f83217133d0696919 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 7 Mar 2013 20:12:46 +1100 Subject: [PATCH] Async Operation Catching @@ -46,7 +46,7 @@ index 5c03732..5f3c780 100644 this.trackedPlayers.remove(entityplayer); entityplayer.removeQueue.add(Integer.valueOf(this.tracker.id)); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 69799d9..b05edd1 100644 +index 964bef6..9306e57 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -924,6 +924,7 @@ public abstract class World implements IBlockAccess { @@ -74,10 +74,10 @@ index 69799d9..b05edd1 100644 Entity entity = null; for (int i = 0; i < list.size(); ++i) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 24230de..e9dc555 100644 +index d0e6d6f..d49393d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -240,6 +240,7 @@ public class CraftWorld implements World { +@@ -239,6 +239,7 @@ public class CraftWorld implements World { } public boolean unloadChunkRequest(int x, int z, boolean safe) { @@ -85,7 +85,7 @@ index 24230de..e9dc555 100644 if (safe && isChunkInUse(x, z)) { return false; } -@@ -250,6 +251,7 @@ public class CraftWorld implements World { +@@ -249,6 +250,7 @@ public class CraftWorld implements World { } public boolean unloadChunk(int x, int z, boolean save, boolean safe) { @@ -93,7 +93,7 @@ index 24230de..e9dc555 100644 if (safe && isChunkInUse(x, z)) { return false; } -@@ -317,6 +319,7 @@ public class CraftWorld implements World { +@@ -316,6 +318,7 @@ public class CraftWorld implements World { } public boolean loadChunk(int x, int z, boolean generate) { diff --git a/CraftBukkit-Patches/0013-View-Distance.patch b/CraftBukkit-Patches/0013-View-Distance.patch index 5e849bd7c..737f62fea 100644 --- a/CraftBukkit-Patches/0013-View-Distance.patch +++ b/CraftBukkit-Patches/0013-View-Distance.patch @@ -1,4 +1,4 @@ -From fef2a238d3d5f93cca594086982a37978b7452be Mon Sep 17 00:00:00 2001 +From e8788463e345a866fe1209bba5ef224ab00bfcbb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -19,7 +19,7 @@ index 0dfd190..c543bed 100644 } else { this.e = i; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ea6e3e6..c3ef7c7 100644 +index 4a8d3f4..5375cb3 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -49,7 +49,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate @@ -32,7 +32,7 @@ index ea6e3e6..c3ef7c7 100644 this.entitiesById = new IntHashMap(); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e9dc555..c1ef7ab 100644 +index d49393d..4d022bd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -83,6 +83,7 @@ public class CraftWorld implements World { @@ -42,8 +42,8 @@ index e9dc555..c1ef7ab 100644 + public int viewDistance; // Spigot end - public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -@@ -137,6 +138,9 @@ public class CraftWorld implements World { + // Spigot start +@@ -136,6 +137,9 @@ public class CraftWorld implements World { itemMergeRadius = configuration.getDouble("world-settings." + name + ".item-merge-radius", itemMergeRadius); expMergeRadius = configuration.getDouble("world-settings." + name + ".exp-merge-radius", expMergeRadius); @@ -53,7 +53,7 @@ index e9dc555..c1ef7ab 100644 if ( info ) { server.getLogger().info( "-------------- Spigot ----------------" ); -@@ -154,6 +158,7 @@ public class CraftWorld implements World { +@@ -153,6 +157,7 @@ public class CraftWorld implements World { server.getLogger().info( "Mushroom Growth Modifier: " + mushroomGrowthModifier ); server.getLogger().info( "Item Merge Radius: " + itemMergeRadius ); server.getLogger().info( "Exp Merge Radius: " + expMergeRadius ); diff --git a/CraftBukkit-Patches/0019-Orebfuscator.patch b/CraftBukkit-Patches/0019-Orebfuscator.patch index 259bc2d79..c7a608699 100644 --- a/CraftBukkit-Patches/0019-Orebfuscator.patch +++ b/CraftBukkit-Patches/0019-Orebfuscator.patch @@ -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 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 ); diff --git a/CraftBukkit-Patches/0022-Entity-Activation-Range.patch b/CraftBukkit-Patches/0022-Entity-Activation-Range.patch index 19ac18e73..55b8e4406 100644 --- a/CraftBukkit-Patches/0022-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0022-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 2a3ea7b58eb897de61764939ca9093abc337fb1c Mon Sep 17 00:00:00 2001 +From 10dfc516e19948d48c68ab9ff6d9452584f50a22 Mon Sep 17 00:00:00 2001 From: Aikar 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 ); diff --git a/CraftBukkit-Patches/0033-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0033-Entity-Tracking-Ranges.patch index 46ce7f1cf..85cfc10d8 100644 --- a/CraftBukkit-Patches/0033-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0033-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 7a9eac68de775fb0a6335ab48aa250a50b455776 Mon Sep 17 00:00:00 2001 +From 84e174ff555e6807f6d921315e65cc438c78e2c0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -24,7 +24,7 @@ index d7efe3e..f6f1ab0 100644 i = this.d; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 2f9d859..6218f16 100644 +index ebf1a67..4439ebc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -89,6 +89,12 @@ public class CraftWorld implements World { @@ -39,8 +39,8 @@ index 2f9d859..6218f16 100644 + public int maxTrackingRange = 64; // Spigot end - public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -@@ -129,6 +135,11 @@ public class CraftWorld implements World { + // Spigot start +@@ -128,6 +134,11 @@ public class CraftWorld implements World { miscEntityActivationRange = configuration.getInt( "world-settings.default.entity-activation-range-misc" ); animalEntityActivationRange = configuration.getInt( "world-settings.default.entity-activation-range-animals" ); monsterEntityActivationRange = configuration.getInt( "world-settings.default.entity-activation-range-monsters" ); @@ -52,7 +52,7 @@ index 2f9d859..6218f16 100644 // Override defaults with world specific, if they exist info = configuration.getBoolean( "world-settings." + name + ".info", info ); -@@ -148,10 +159,19 @@ public class CraftWorld implements World { +@@ -147,10 +158,19 @@ public class CraftWorld implements World { miscEntityActivationRange = configuration.getInt( "world-settings." + name + ".entity-activation-range-misc", miscEntityActivationRange ); animalEntityActivationRange = configuration.getInt( "world-settings." + name + ".entity-activation-range-animals", animalEntityActivationRange ); monsterEntityActivationRange = configuration.getInt( "world-settings." + name + ".entity-activation-range-monsters", monsterEntityActivationRange ); @@ -72,7 +72,7 @@ index 2f9d859..6218f16 100644 if ( info ) { -@@ -173,6 +193,7 @@ public class CraftWorld implements World { +@@ -172,6 +192,7 @@ public class CraftWorld implements World { server.getLogger().info( "View distance: " + viewDistance ); server.getLogger().info( "Orebfuscator: " + obfuscated ); server.getLogger().info( "Entity Activation Range: An " + animalEntityActivationRange + " / Mo " + monsterEntityActivationRange + " / Mi " + miscEntityActivationRange ); diff --git a/CraftBukkit-Patches/0050-Particle-API.patch b/CraftBukkit-Patches/0050-Particle-API.patch index 2b33e4b26..53954f6a1 100644 --- a/CraftBukkit-Patches/0050-Particle-API.patch +++ b/CraftBukkit-Patches/0050-Particle-API.patch @@ -1,4 +1,4 @@ -From 5947136292ce1e17489a7a0b44476ec85b1249ca Mon Sep 17 00:00:00 2001 +From fa2fcf2e45e5fcf0b68f3cac7ef0d48a18d26b80 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 16:14:30 +1000 Subject: [PATCH] Particle API @@ -43,10 +43,10 @@ index 7de0de5..7eca388 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6218f16..d169b5f 100644 +index 4439ebc..e762c9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -886,31 +886,21 @@ public class CraftWorld implements World { +@@ -885,31 +885,21 @@ public class CraftWorld implements World { } else { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } @@ -88,7 +88,7 @@ index 6218f16..d169b5f 100644 public T spawn(Location location, Class clazz) throws IllegalArgumentException { return spawn(location, clazz, SpawnReason.CUSTOM); } -@@ -1389,6 +1379,62 @@ public class CraftWorld implements World { +@@ -1388,6 +1378,62 @@ public class CraftWorld implements World { // Spigot start private final Spigot spigot = new Spigot() {