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 This commit allows the user to select per world view distances, and view distances below 3. Be wary of the issues selecting a view distance of 1 or 2 may cause! diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java index 0dfd190..c543bed 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -22,7 +22,7 @@ public class PlayerChunkMap { public PlayerChunkMap(WorldServer worldserver, int i) { if (i > 15) { throw new IllegalArgumentException("Too big view radius!"); - } else if (i < 3) { + } else if (i < 1) { throw new IllegalArgumentException("Too small view radius!"); } 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 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 // CraftBukkit end this.server = minecraftserver; this.tracker = new EntityTracker(this); - this.manager = new PlayerChunkMap(this, minecraftserver.getPlayerList().o()); + this.manager = new PlayerChunkMap(this, getWorld().viewDistance); // Spigot if (this.entitiesById == null) { 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 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 { // Merge radius: public double itemMergeRadius = 3.5; public double expMergeRadius = 3.5; + public int viewDistance; // Spigot end // 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); + viewDistance = Bukkit.getServer().getViewDistance(); + viewDistance = configuration.getInt( "world-settings." + name + ".view-distance", viewDistance ); + if ( info ) { server.getLogger().info( "-------------- Spigot ----------------" ); @@ -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 ); + server.getLogger().info( "View distance: " + viewDistance ); server.getLogger().info( "-------------------------------------------------" ); } // Spigot end diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml index 56873b6..fe257e2 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -50,6 +50,7 @@ world-settings: world: growth-chunks-per-tick: 1000 world_nether: + view-distance: 5 growth-chunks-per-tick: 0 random-light-updates: true spawn-limits: -- 1.8.1.2