From 6d7cc61d4d6a848a0a865343eb1ddafdd45196c5 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Mon, 15 Aug 2011 14:27:02 -0400
Subject: [PATCH] Revert "Implements interface for changing the view distance."

By: EvilSeph <evilseph@gmail.com>
---
 .../org/bukkit/craftbukkit/CraftServer.java   | 20 ++++-------------
 .../org/bukkit/craftbukkit/CraftWorld.java    | 20 -----------------
 .../craftbukkit/entity/CraftPlayer.java       | 22 ++-----------------
 3 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ec5dbb77ff..5eb2bd5368 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -275,6 +275,10 @@ public final class CraftServer implements Server {
         return this.getConfigInt("server-port", 25565);
     }
 
+    public int getViewDistance() {
+        return this.getConfigInt("view-distance", 10);
+    }
+
     public String getIp() {
         return this.getConfigString("server-ip", "");
     }
@@ -750,22 +754,6 @@ public final class CraftServer implements Server {
         return this.console.allowFlight;
     }
 
-    public int getViewDistance() {
-        return server.getViewDistance();
-    }
-
-    public void setViewDistance(int viewDistance) throws IllegalArgumentException{
-        server.setViewDistance(viewDistance);
-        updateViewDistance();
-        server.saveViewDistance();
-    }
-
-    public void updateViewDistance() {
-        for (World world : worlds.values()) {
-            ((CraftWorld) world).updateViewDistance();
-        }
-    }
-
     public ChunkGenerator getGenerator(String world) {
         ConfigurationNode node = configuration.getNode("worlds");
         ChunkGenerator result = null;
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index b527515f83..ed09f0f33d 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -811,24 +811,4 @@ public class CraftWorld implements World {
             }
         }
     }
-
-    public int getViewDistance() {
-        return world.getViewDistance();
-    }
-
-    public void setViewDistance(int viewDistance) throws IllegalArgumentException{
-        world.setViewDistance(viewDistance);
-    }
-
-    public void resetViewDistance(){
-        world.resetViewDistance();
-    }
-
-    public boolean isViewDistanceSet() {
-        return world.isViewDistanceSet();
-    }
-
-    public void updateViewDistance() {
-        world.updateViewDistance();
-    }
 }
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f363535779..c86d7e5c99 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,7 @@
 package org.bukkit.craftbukkit.entity;
 
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import net.minecraft.server.EntityHuman;
 import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.Packet131;
@@ -26,11 +28,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.map.MapView;
 
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-
 public class CraftPlayer extends CraftHumanEntity implements Player {
-
     public CraftPlayer(CraftServer server, EntityPlayer entity) {
         super(server, entity);
     }
@@ -347,20 +345,4 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public void resetPlayerTime() {
         setPlayerTime(0, true);
     }
-
-    public void setViewDistance(int viewDistance) {
-        getHandle().setViewDistance(viewDistance);
-    }
-
-    public int getViewDistance() {
-        return getHandle().getViewDistance();
-    }
-
-    public void resetViewDistance() {
-        getHandle().resetViewDistance();
-    }
-
-    public boolean isViewDistanceSet() {
-        return getHandle().isViewDistanceSet();
-    }
 }