19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
56 lines
2.5 KiB
Diff
56 lines
2.5 KiB
Diff
From 2d77781735f24206efabc85b2686de7ffe8ee94b Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
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 8ac9387..5ca5935 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
@@ -26,9 +26,9 @@ public class PlayerChunkMap {
|
|
private final int[][] i = new int[][] { { 1, 0}, { 0, 1}, { -1, 0}, { 0, -1}};
|
|
private boolean wasNotEmpty; // CraftBukkit - add field
|
|
|
|
- public PlayerChunkMap(WorldServer worldserver) {
|
|
+ public PlayerChunkMap(WorldServer worldserver, int viewDistance /* Spigot */) {
|
|
this.world = worldserver;
|
|
- this.a(worldserver.getMinecraftServer().getPlayerList().t());
|
|
+ this.a(viewDistance); // Spigot
|
|
}
|
|
|
|
public WorldServer a() {
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 93e5a14..f34b76e 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -62,7 +62,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
// CraftBukkit end
|
|
this.server = minecraftserver;
|
|
this.tracker = new EntityTracker(this);
|
|
- this.manager = new PlayerChunkMap(this);
|
|
+ this.manager = new PlayerChunkMap(this, spigotConfig.viewDistance); // Spigot
|
|
this.worldProvider.a(this);
|
|
this.chunkProvider = this.k();
|
|
this.Q = new org.bukkit.craftbukkit.CraftTravelAgent(this); // CraftBukkit
|
|
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
index 1545a61..6cc3a91 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
@@ -124,4 +124,11 @@ public class SpigotWorldConfig
|
|
expMerge = getDouble("merge-radius.exp", 3.0 );
|
|
log( "Experience Merge Radius: " + expMerge );
|
|
}
|
|
+
|
|
+ public int viewDistance;
|
|
+ private void viewDistance()
|
|
+ {
|
|
+ viewDistance = getInt( "view-distance", Bukkit.getViewDistance() );
|
|
+ log( "View Distance: " + viewDistance );
|
|
+ }
|
|
}
|
|
--
|
|
2.1.0
|
|
|