mirror of
https://github.com/CodeMC/WorldGuardWrapper.git
synced 2025-04-28 15:12:37 +02:00
Some fixes
This commit is contained in:
stijnb1234
parent
a2977cb02d
commit
df8dd8a0a0
|
|
@ -23,10 +23,13 @@ public interface IWrappedRegion {
|
|||
|
||||
void setPriority(int priority);
|
||||
|
||||
void setParent(IWrappedRegion parent);
|
||||
|
||||
IWrappedDomain getOwners();
|
||||
|
||||
IWrappedDomain getMembers();
|
||||
|
||||
boolean contains(Location location);
|
||||
|
||||
Object convertToRegion();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,6 +116,14 @@ public class WrappedRegion implements IWrappedRegion {
|
|||
handle.setPriority(priority);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setParent(IWrappedRegion parent) {
|
||||
ProtectedRegion parentRegion = (ProtectedRegion) parent.convertToRegion();
|
||||
try {
|
||||
handle.setParent(parentRegion);
|
||||
} catch (ProtectedRegion.CircularInheritanceException ignored) {/* Circular inheritance is detected */}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IWrappedDomain getOwners() {
|
||||
return new IWrappedDomain() {
|
||||
|
|
@ -191,4 +199,9 @@ public class WrappedRegion implements IWrappedRegion {
|
|||
return handle.contains(WorldGuardVectorUtilities.toBlockVector(location));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ProtectedRegion convertToRegion() {
|
||||
return handle;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,6 +112,14 @@ public class WrappedRegion implements IWrappedRegion {
|
|||
handle.setPriority(priority);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setParent(IWrappedRegion parent) {
|
||||
ProtectedRegion parentRegion = (ProtectedRegion) parent.convertToRegion();
|
||||
try {
|
||||
handle.setParent(parentRegion);
|
||||
} catch (ProtectedRegion.CircularInheritanceException ignored) {/* Circular inheritance is detected */}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IWrappedDomain getOwners() {
|
||||
return new IWrappedDomain() {
|
||||
|
|
@ -187,4 +195,8 @@ public class WrappedRegion implements IWrappedRegion {
|
|||
return handle.contains(WorldGuardVectorUtilities.toBlockVector(location));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ProtectedRegion convertToRegion() {
|
||||
return handle;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,6 +112,14 @@ public class WrappedRegion implements IWrappedRegion {
|
|||
handle.setPriority(priority);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setParent(IWrappedRegion parent) {
|
||||
ProtectedRegion parentRegion = (ProtectedRegion) parent.convertToRegion();
|
||||
try {
|
||||
handle.setParent(parentRegion);
|
||||
} catch (ProtectedRegion.CircularInheritanceException ignored) {/* Circular inheritance is detected */}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IWrappedDomain getOwners() {
|
||||
return new IWrappedDomain() {
|
||||
|
|
@ -187,4 +195,8 @@ public class WrappedRegion implements IWrappedRegion {
|
|||
return handle.contains(BukkitAdapter.asBlockVector(location));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ProtectedRegion convertToRegion() {
|
||||
return handle;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
96
pom.xml
96
pom.xml
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
<groupId>org.codemc.worldguardwrapper</groupId>
|
||||
<artifactId>worldguardwrapper-parent</artifactId>
|
||||
<version>1.1.9-SNAPSHOT</version>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
|
|
@ -20,30 +20,10 @@
|
|||
<url>https://github.com/CodeMC/WorldGuardWrapper</url>
|
||||
<inceptionYear>2018</inceptionYear>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:https://github.com/CodeMC/WorldGuardWrapper.git</connection>
|
||||
<developerConnection>scm:git:git@github.com:CodeMC/WorldGuardWrapper.git</developerConnection>
|
||||
<url>https://github.com/CodeMC/WorldGuardWrapper</url>
|
||||
</scm>
|
||||
|
||||
<ciManagement>
|
||||
<system>jenkins</system>
|
||||
<url>http://ci.codemc.org/job/CodeMC/job/HolographicDisplays/</url>
|
||||
</ciManagement>
|
||||
|
||||
<issueManagement>
|
||||
<system>GitHub</system>
|
||||
<url>https://github.com/CodeMC/WorldGuardWrapper/issues</url>
|
||||
</issueManagement>
|
||||
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>codemc-snapshots</id>
|
||||
<url>https://repo.codemc.org/repository/maven-snapshots/</url>
|
||||
</snapshotRepository>
|
||||
<repository>
|
||||
<id>codemc-releases</id>
|
||||
<url>https://repo.codemc.org/repository/maven-releases/</url>
|
||||
<id>iobyte-nexus</id>
|
||||
<url>https://nexus.iobyte.nl/repository/maven-releases</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
|
|
@ -103,16 +83,6 @@
|
|||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
|
|
@ -122,44 +92,46 @@
|
|||
<target>${java.version}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.22.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<configuration>
|
||||
<show>public</show>
|
||||
<failOnError>false</failOnError>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>3.2.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.2.4</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>shade</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>2.8.2</version>
|
||||
<configuration>
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.sonatype.plugins</groupId>
|
||||
<artifactId>nexus-staging-maven-plugin</artifactId>
|
||||
<version>1.6.8</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-deploy</id>
|
||||
<phase>deploy</phase>
|
||||
<goals>
|
||||
<goal>deploy</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<serverId>nexus</serverId>
|
||||
<nexusUrl>https://nexus.iobyte.nl/</nexusUrl>
|
||||
<skipStaging>true</skipStaging>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user