Bugfixes

cyberpwnn · Jan 3, 2019 · 0d96a20 · 0d96a20
1 parent 9c15341
commit 0d96a20
Show file tree

Hide file tree

Showing 12 changed files with 323 additions and 25 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.volmit</groupId>
   <artifactId>Phantom</artifactId>
   <name>Phantom</name>
-  <version>3.1.28</version>
+  <version>3.1.29</version>
   <build>
     <resources>
       <resource>
@@ -51,17 +51,17 @@
                 <configuration>
                   <executable>C:\Users\cyberpwn\Documents\development\workspace\Phantom/scripts/release.bat</executable>
                   <arguments>
-                    <argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\target\Phantom-3.1.28.jar</argument>
-                    <argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\release\3.1.28\Phantom-3.1.28.jar</argument>
+                    <argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\target\Phantom-3.1.29.jar</argument>
+                    <argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\release\3.1.29\Phantom-3.1.29.jar</argument>
                   </arguments>
                 </configuration>
               </execution>
             </executions>
             <configuration>
               <executable>C:\Users\cyberpwn\Documents\development\workspace\Phantom/scripts/release.bat</executable>
               <arguments>
-                <argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\target\Phantom-3.1.28.jar</argument>
-                <argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\release\3.1.28\Phantom-3.1.28.jar</argument>
+                <argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\target\Phantom-3.1.29.jar</argument>
+                <argument>C:\Users\cyberpwn\Documents\development\workspace\Phantom\release\3.1.29\Phantom-3.1.29.jar</argument>
               </arguments>
             </configuration>
           </plugin>
@@ -177,6 +177,18 @@
           <artifactId>json-simple</artifactId>
           <groupId>com.googlecode.json-simple</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>guava</artifactId>
+          <groupId>com.google.guava</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>gson</artifactId>
+          <groupId>com.google.code.gson</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>snakeyaml</artifactId>
+          <groupId>org.yaml</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>bungeecord-chat</artifactId>
           <groupId>net.md-5</groupId>
@@ -223,6 +235,70 @@
       <version>2.8.7</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.plotsquared</groupId>
+      <artifactId>plotsquared-api</artifactId>
+      <version>17.08.09-ac9042b-1895</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>guava</artifactId>
+          <groupId>com.google.guava</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>snakeyaml</artifactId>
+          <groupId>org.yaml</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>gson</artifactId>
+          <groupId>com.google.code.gson</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.sk89q.worldedit</groupId>
+      <artifactId>worldedit-core</artifactId>
+      <version>6.1.3-SNAPSHOT</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>truezip</artifactId>
+          <groupId>de.schlichtherle</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>js</artifactId>
+          <groupId>rhino</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jsr305</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>paranamer</artifactId>
+          <groupId>com.thoughtworks.paranamer</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jlibnoise</artifactId>
+          <groupId>com.sk89q.lib</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jchronic</artifactId>
+          <groupId>com.sk89q</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>guava</artifactId>
+          <groupId>com.google.guava</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>snakeyaml</artifactId>
+          <groupId>org.yaml</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>gson</artifactId>
+          <groupId>com.google.code.gson</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>spigot.org</groupId>
       <artifactId>spigot-1.12.2</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.volmit</groupId>
 	<artifactId>Phantom</artifactId>
-	<version>3.1.28</version>
+	<version>3.1.29</version>
 	<name>Phantom</name>
 	<properties>
 		<build></build>
@@ -225,11 +225,13 @@
 			<groupId>com.plotsquared</groupId>
 			<artifactId>plotsquared-api</artifactId>
 			<version>17.08.09-ac9042b-1895</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.sk89q.worldedit</groupId>
 			<artifactId>worldedit-core</artifactId>
 			<version>6.1.3-SNAPSHOT</version>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 	<distributionManagement>

diff --git a/src/main/java/com/volmit/phantom/plugin/Phantom.java b/src/main/java/com/volmit/phantom/plugin/Phantom.java
@@ -177,7 +177,23 @@ public static void stopService(Class<? extends IService> i)
 
 	public static World getDefaultWorld()
 	{
-		return Bukkit.getWorld("world");
+		World w = Bukkit.getWorld("world");
+
+		if(w == null)
+		{
+			for(World i : Bukkit.getWorlds())
+			{
+				if(i.getName().contains("/"))
+				{
+					continue;
+				}
+
+				w = i;
+				break;
+			}
+		}
+
+		return w;
 	}
 
 	public static void suckerpunch()

diff --git a/src/main/java/com/volmit/phantom/rift/FlatGenerator.java b/src/main/java/com/volmit/phantom/rift/FlatGenerator.java
@@ -21,7 +21,7 @@ public short[][] generateExtBlockSections(World world, Random random, int x, int
 			{
 				setBlock(result, i, 0, j, (short) Material.BEDROCK.getId());
 
-				if(i == 0 || j == 0)
+				if(x % 2 == 0 ^ z % 2 == 0)
 				{
 					setBlock(result, i, 1, j, (short) Material.PURPUR_BLOCK.getId());
 				}
@@ -30,11 +30,6 @@ public short[][] generateExtBlockSections(World world, Random random, int x, int
 				{
 					setBlock(result, i, 1, j, (short) Material.END_BRICKS.getId());
 				}
-
-				if(i == 0 && j == 0)
-				{
-					setBlock(result, i, 2, j, (short) Material.END_ROD.getId());
-				}
 			}
 		}