From c15c99d06b61dcba40a310537e6bd9ce4f9835d3 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 22 Nov 2018 15:33:26 +0100 Subject: [PATCH] Bump version, fix build --- api/pom.xml | 2 +- implementation/interface/pom.xml | 4 +- implementation/pom.xml | 2 +- implementation/v6/pom.xml | 4 +- implementation/v7/pom.xml | 4 +- .../v7/WorldGuardImplementation.java | 69 +++++++++++++++++-- library/pom.xml | 6 +- pom.xml | 2 +- 8 files changed, 77 insertions(+), 16 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 044656c..629598e 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-parent - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT worldguardwrapper-api diff --git a/implementation/interface/pom.xml b/implementation/interface/pom.xml index 4fd12fc..79e9ab0 100644 --- a/implementation/interface/pom.xml +++ b/implementation/interface/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-implementation - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT worldguardwrapper-implementation-interface @@ -18,7 +18,7 @@ ${project.groupId} worldguardwrapper-api - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT diff --git a/implementation/pom.xml b/implementation/pom.xml index da34b9c..470b738 100644 --- a/implementation/pom.xml +++ b/implementation/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-parent - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT worldguardwrapper-implementation diff --git a/implementation/v6/pom.xml b/implementation/v6/pom.xml index 826312f..8351242 100644 --- a/implementation/v6/pom.xml +++ b/implementation/v6/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-implementation - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT worldguardwrapper-implementation-v6 @@ -18,7 +18,7 @@ ${project.groupId} worldguardwrapper-implementation-interface - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT com.sk89q.worldguard diff --git a/implementation/v7/pom.xml b/implementation/v7/pom.xml index e541f00..fcf4d49 100644 --- a/implementation/v7/pom.xml +++ b/implementation/v7/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-implementation - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT worldguardwrapper-implementation-v7 @@ -18,7 +18,7 @@ ${project.groupId} worldguardwrapper-implementation-interface - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT com.sk89q.worldguard diff --git a/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/WorldGuardImplementation.java b/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/WorldGuardImplementation.java index 5eb7033..98a26a7 100644 --- a/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/WorldGuardImplementation.java +++ b/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/WorldGuardImplementation.java @@ -25,6 +25,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; import org.codemc.worldguardwrapper.flags.AbstractWrappedFlag; import org.codemc.worldguardwrapper.implementation.IWorldGuardImplementation; +import org.codemc.worldguardwrapper.region.PlayerDomain; import org.codemc.worldguardwrapper.region.WrappedRegion; import org.codemc.worldguardwrapper.selection.CuboidSelection; import org.codemc.worldguardwrapper.selection.PolygonalSelection; @@ -141,13 +142,73 @@ public class WorldGuardImplementation implements IWorldGuardImplementation { } @Override - public Set getOwners() { - return region.getOwners().getUniqueIds(); + public PlayerDomain getOwners() { + return new PlayerDomain() { + @Override + public Set getPlayers() { + return region.getOwners().getUniqueIds(); + } + + @Override + public void addPlayer(UUID uuid) { + region.getOwners().addPlayer(uuid); + } + + @Override + public void removePlayer(UUID uuid) { + region.getOwners().removePlayer(uuid); + } + + @Override + public Set getGroups() { + return region.getOwners().getGroups(); + } + + @Override + public void addGroup(String name) { + region.getOwners().addGroup(name); + } + + @Override + public void removeGroup(String name) { + region.getOwners().removeGroup(name); + } + }; } @Override - public Set getMembers() { - return region.getMembers().getUniqueIds(); + public PlayerDomain getMembers() { + return new PlayerDomain() { + @Override + public Set getPlayers() { + return region.getMembers().getUniqueIds(); + } + + @Override + public void addPlayer(UUID uuid) { + region.getMembers().addPlayer(uuid); + } + + @Override + public void removePlayer(UUID uuid) { + region.getMembers().removePlayer(uuid); + } + + @Override + public Set getGroups() { + return region.getMembers().getGroups(); + } + + @Override + public void addGroup(String name) { + region.getMembers().addGroup(name); + } + + @Override + public void removeGroup(String name) { + region.getMembers().removeGroup(name); + } + }; } @Override diff --git a/library/pom.xml b/library/pom.xml index cceae2e..d22b693 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-parent - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT worldguardwrapper @@ -18,13 +18,13 @@ ${project.groupId} worldguardwrapper-implementation-v6 - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT true ${project.groupId} worldguardwrapper-implementation-v7 - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT true diff --git a/pom.xml b/pom.xml index d6b8fba..0630e94 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.codemc.worldguardwrapper worldguardwrapper-parent - 1.0.3-SNAPSHOT + 1.0.4-SNAPSHOT pom