fixed #1294

Terasology-Archived · Oct 22, 2014 · 9373e1e · 9373e1e
1 parent 3ec5920
commit 9373e1e
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,13 @@
-# Simple stuff modules should ignore
+# Modules get a copy of build.gradle as they are not allowed to have their own (for build security / sandboxing)
+build.gradle
+
+# IntelliJ
 *.iml
-build.gradle
+
+# Eclipse
+.checkstyle
+.classpath
+.project
+.settings
+bin/
+build/
diff --git a/src/main/java/org/terasology/navgraph/NavGraphSystem.java b/src/main/java/org/terasology/navgraph/NavGraphSystem.java
@@ -36,6 +36,8 @@
 import org.terasology.world.chunks.event.OnChunkLoaded;
 
 import javax.vecmath.Vector3f;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -69,7 +71,13 @@ public void initialise() {
 
     @Override
     public void shutdown() {
-
+        AccessController.doPrivileged(new PrivilegedAction<Object>() {
+            @Override
+            public Object run() {
+                taskMaster.shutdown(new ShutdownTask(), false);
+                return null;
+            }
+        });
     }
 
     @Override
@@ -204,4 +212,30 @@ public int compareTo(NavGraphTask o) {
         }
     }
 
+    public static class ShutdownTask implements NavGraphTask {
+        @Override
+        public int getPriority() {
+            return -1;
+        }
+
+        @Override
+        public int compareTo(NavGraphTask o) {
+            return Integer.compare(this.getPriority(), o.getPriority());
+        }
+
+        @Override
+        public String getName() {
+            return "Pathfinder:UpdateChunk";
+        }
+
+        @Override
+        public void run() {
+
+        }
+
+        @Override
+        public boolean isTerminateSignal() {
+            return true;
+        }
+    }
 }
diff --git a/src/main/java/org/terasology/work/WorkBoard.java b/src/main/java/org/terasology/work/WorkBoard.java
@@ -43,6 +43,8 @@
 import org.terasology.work.kmeans.Cluster;
 import org.terasology.world.BlockEntityRegistry;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Map;
 
 /**
@@ -151,6 +153,13 @@ public void onSelectionChanged(ApplyBlockSelectionEvent event, EntityRef entity)
 
     @Override
     public void shutdown() {
+        AccessController.doPrivileged(new PrivilegedAction<Object>() {
+            @Override
+            public Object run() {
+                taskMaster.shutdown(new ShutdownTask(), false);
+                return null;
+            }
+        });
     }
 
     public void offer(WorkBoardTask task) {
@@ -195,7 +204,6 @@ public String getName() {
 
         @Override
         public void run() {
-            logger.info("rebuild after nav graph change");
             for (EntityRef work : entityManager.getEntitiesWith(WorkTargetComponent.class)) {
                 WorkTargetComponent workTargetComponent = work.getComponent(WorkTargetComponent.class);
                 WorkType workType = getWorkType(workTargetComponent.getWork());
@@ -338,4 +346,31 @@ public boolean isTerminateSignal() {
             return false;
         }
     }
+
+    public static class ShutdownTask implements WorkBoardTask {
+        @Override
+        public int getPriority() {
+            return -1;
+        }
+
+        @Override
+        public int compareTo(WorkBoardTask o) {
+            return Integer.compare(this.getPriority(), o.getPriority());
+        }
+
+        @Override
+        public String getName() {
+            return "WorkBoard:ShutdownTask";
+        }
+
+        @Override
+        public void run() {
+
+        }
+
+        @Override
+        public boolean isTerminateSignal() {
+            return true;
+        }
+    }
 }