EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues 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 # Maven
We're now on maven! We're now on maven! (Unofficial Maven Repo)
```xml ```xml
<!-- Repository --> <!-- Repository -->
<repository> <repository>
<id>intellectualsites</id> <id>xephi-repo</id>
<url>http://ci.xephi.fr/plugin/repository/everything/</url> <url>http://ci.xephi.fr/plugin/repository/everything/</url>
</repository> </repository>
<!-- Dependency --> <!-- Dependency -->
<dependency> <dependency>
<groupId>com.intellectualcrafters</groupId> <groupId>com.intellectualcrafters</groupId>
<artifactId>PlotSquared</artifactId> <artifactId>plotsquared</artifactId>
<version>3.2.24</version> <version>3.2.27-SNAPSHOT</version>
</dependency> </dependency>
``` ```

65
pom.xml
View File

@ -52,7 +52,7 @@
</properties> </properties>
<build> <build>
<finalName>${project.name}-Universal-${project.version}</finalName> <finalName>${project.name}-Bukkit-${project.version}</finalName>
<sourceDirectory>src/main/java</sourceDirectory> <sourceDirectory>src/main/java</sourceDirectory>
<resources> <resources>
@ -73,12 +73,17 @@
</resources> </resources>
<plugins> <plugins>
<!-- TODO: split the project into more modules --> <!--
TODO: split the project into more modules
TODO: fix sponge compilation
-->
<!-- Invalid
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.6</version> <version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>bukkit</id> <id>bukkit</id>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
@ -107,7 +112,6 @@
</configuration> </configuration>
</execution> </execution>
<!-- Invalid
<execution> <execution>
<id>api</id> <id>api</id>
<goals> <goals>
@ -123,9 +127,9 @@
</excludes> </excludes>
</configuration> </configuration>
</execution> </execution>
-->
</executions> </executions>
</plugin> </plugin>
-->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -134,6 +138,9 @@
<configuration> <configuration>
<source>1.7</source> <source>1.7</source>
<target>${javaVersion}</target> <target>${javaVersion}</target>
<excludes>
<exclude>**/com/plotsquared/sponge/**</exclude>
</excludes>
</configuration> </configuration>
</plugin> </plugin>
@ -149,6 +156,14 @@
<pattern>com.google.gson</pattern> <pattern>com.google.gson</pattern>
<shadedPattern>com.plotsquared.libs.gson</shadedPattern> <shadedPattern>com.plotsquared.libs.gson</shadedPattern>
</relocation> </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> </relocations>
</configuration> </configuration>
<executions> <executions>
@ -235,10 +250,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>jsr305</artifactId> <artifactId>jsr305</artifactId>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -257,22 +272,22 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>truezip</artifactId> <artifactId>truezip</artifactId>
<groupId>de.schlichtherle</groupId> <groupId>de.schlichtherle</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>js</artifactId> <artifactId>js</artifactId>
<groupId>rhino</groupId> <groupId>rhino</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>jsr305</artifactId> <artifactId>jsr305</artifactId>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

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

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