Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-21 11:45:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shade libs

Browse Source
This commit is contained in:
Gabriele C 2016-01-20 13:30:03 +01:00
parent efeecd423e
commit a872bd0f61
3 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -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>
<version>3.2.24</version>
<artifactId>plotsquared</artifactId>
<version>3.2.27-SNAPSHOT</version>
</dependency>
```

65
pom.xml
View File

@ -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,12 +73,17 @@
</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>
<executions>
<execution>
<execution>
<id>bukkit</id>
<goals>
<goal>jar</goal>
@ -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>
@ -235,10 +250,10 @@
<scope>provided</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<artifactId>jsr305</artifactId>
<groupId>com.google.code.findbugs</groupId>
</exclusion>
<exclusion>
<artifactId>jsr305</artifactId>
<groupId>com.google.code.findbugs</groupId>
</exclusion>
</exclusions>
</dependency>
@ -257,22 +272,22 @@
<scope>provided</scope>
<optional>true</optional>
<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>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
<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>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
</exclusions>
</dependency>

2
src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java
View File

@ -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;
}