un-cache base plot on merge

pom.xml

@@ -8,7 +8,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <artifactId>PlotSquared</artifactId>
-    <version>3.2.2</version>
+    <version>3.2.3</version>
     <name>PlotSquared</name>
     <packaging>jar</packaging>
     <build>

src/main/java/com/intellectualcrafters/plot/PS.java

@@ -967,13 +967,13 @@ public class PS {
         for (final String world : worlds) {
             switch (type) {
                 case CREATION_DATE:
-                    toReturn.addAll(sortPlotsByTemp(getPlotsInWorld(world)));
+                    toReturn.addAll(sortPlotsByTemp(map.get(world)));
                     break;
                 case CREATION_DATE_TIMESTAMP:
-                    toReturn.addAll(sortPlotsByTimestamp(getPlotsInWorld(world)));
+                    toReturn.addAll(sortPlotsByTimestamp(map.get(world)));
                     break;
                 case DISTANCE_FROM_ORIGIN:
-                    toReturn.addAll(sortPlotsByHash(getPlotsInWorld(world)));
+                    toReturn.addAll(sortPlotsByHash(map.get(world)));
                     break;
                 default:
                     break;

src/main/java/com/intellectualcrafters/plot/object/Plot.java

@@ -1134,6 +1134,7 @@ public class Plot {
         DBFunc.setMerged(this, merged);
         MainUtil.connected_cache = null;
         MainUtil.regions_cache = null;
+        origin = null;
     }
 
     /**
@@ -1147,6 +1148,7 @@ public class Plot {
             DBFunc.setMerged(this, getSettings().getMerged());
             MainUtil.connected_cache = null;
             MainUtil.regions_cache = null;
+            origin = null;
         }
     }