From a574ec54cc68710e6949d462c4571c87d2c7e37a Mon Sep 17 00:00:00 2001
From: Travis Watkins <amaranth@ubuntu.com>
Date: Sun, 5 Aug 2012 20:03:12 -0500
Subject: Put forceChunkLoad back to its original value.

---
 src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java
index f1d2cd3a..47a3c787 100644
--- a/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java
+++ b/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java
@@ -24,7 +24,10 @@ public class PortalTravelAgent implements TravelAgent {
 
     public Location findOrCreate(Location location) {
         WorldServer worldServer = ((CraftWorld) location.getWorld()).getHandle();
-        worldServer.chunkProviderServer.forceChunkLoad = true;
+        boolean wasEnabled = worldServer.chunkProviderServer.forceChunkLoad;
+        if (!wasEnabled) {
+            worldServer.chunkProviderServer.forceChunkLoad = true;
+        }
         // Attempt to find a Portal.
         Location resultLocation = this.findPortal(location);
         // If a Portal cannot be found we will attempt to create one.
@@ -38,7 +41,10 @@ public class PortalTravelAgent implements TravelAgent {
                 resultLocation = location;
             }
         }
-        worldServer.chunkProviderServer.forceChunkLoad = false;
+
+        if (!wasEnabled) {
+            worldServer.chunkProviderServer.forceChunkLoad = false;
+        }
         // Return our resulting portal location.
         return resultLocation;
     }
-- 
cgit v1.2.3