Shade libs

README.md

@@ -22,18 +22,18 @@ is to provide a lag-free and smooth experience.
 
 
 # Maven
-We're now on maven!
+We're now on maven! (Unofficial Maven Repo)
 ```xml
 <!-- Repository -->
 <repository>
-    <id>intellectualsites</id>
+    <id>xephi-repo</id>
     <url>http://ci.xephi.fr/plugin/repository/everything/</url>
 </repository>
 <!-- Dependency -->
 <dependency>
   <groupId>com.intellectualcrafters</groupId>
-  <artifactId>PlotSquared</artifactId>
+  <artifactId>plotsquared</artifactId>
-  <version>3.2.24</version>
+  <version>3.2.27-SNAPSHOT</version>
 </dependency>
 ```
 

pom.xml

@@ -52,7 +52,7 @@
     </properties>
 
     <build>
-        <finalName>${project.name}-Universal-${project.version}</finalName>
+        <finalName>${project.name}-Bukkit-${project.version}</finalName>
         <sourceDirectory>src/main/java</sourceDirectory>
 
         <resources>
@@ -73,7 +73,12 @@
         </resources>
 
         <plugins>
-            <!-- TODO: split the project into more modules -->
+            <!--
+            TODO: split the project into more modules
+            TODO: fix sponge compilation
+            -->
+
+            <!-- Invalid
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.6</version>
@@ -107,7 +112,6 @@
                         </configuration>
                     </execution>
 
-                    <!-- Invalid
                     <execution>
                         <id>api</id>
                         <goals>
@@ -123,9 +127,9 @@
                             </excludes>
                         </configuration>
                     </execution>
-                    -->
                 </executions>
             </plugin>
+            -->
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -134,6 +138,9 @@
                 <configuration>
                     <source>1.7</source>
                     <target>${javaVersion}</target>
+                    <excludes>
+                        <exclude>**/com/plotsquared/sponge/**</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
 
@@ -149,6 +156,14 @@
                             <pattern>com.google.gson</pattern>
                             <shadedPattern>com.plotsquared.libs.gson</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>javax.websocket</pattern>
+                            <shadedPattern>com.plotsquared.libs.websocket</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.math3</pattern>
+                            <shadedPattern>com.plotsquared.libs.math3</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>

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

@@ -42,7 +42,7 @@ public class PlotHandler {
         if (!plot.isMerged()) {
             return false;
         }
-        for (Plot current : MainUtil.getConnectedPlots(plot);) {
+        for (Plot current : MainUtil.getConnectedPlots(plot)) {
             if (current.owner.equals(uuid)) {
                 return true;
             }