diff --git a/.gitignore b/.gitignore index dbcdfa6..2375d83 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ dependency-reduced-pom.xml .idea .circleci *.iml +/target/ diff --git a/pom.xml b/pom.xml index a9db4c8..ff24a94 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.drawethree.xprison X-Prison - 1.13.1 + 1.13.2 XPrison Reloaded diff --git a/src/main/java/dev/drawethree/xprison/gangs/managers/GangsManager.java b/src/main/java/dev/drawethree/xprison/gangs/managers/GangsManager.java index b6d92f7..6d9103e 100644 --- a/src/main/java/dev/drawethree/xprison/gangs/managers/GangsManager.java +++ b/src/main/java/dev/drawethree/xprison/gangs/managers/GangsManager.java @@ -117,8 +117,7 @@ public class GangsManager { return GangCreateResult.EVENT_CANCELLED; } - // Use the async version to create a gang - this.plugin.getGangsService().createGangAsync(g); + this.plugin.getGangsService().createGangAsync(g); // Use async method PlayerUtils.sendMessage(creator, this.plugin.getConfig().getMessage("gang-created").replace("%name%", TextUtils.applyColor(name))); Players.all().forEach(player -> PlayerUtils.sendMessage(player, this.plugin.getConfig().getMessage("gang-create-broadcast").replace("%gang%", TextUtils.applyColor(g.getName())).replace("%player%", creator.getName()))); @@ -127,6 +126,7 @@ public class GangsManager { + // public GangCreateResult createGang(String name, Player creator) { // // if (this.getPlayerGang(creator).isPresent()) { @@ -369,8 +369,7 @@ public class GangsManager { } gang.disband(); - // Use the async version to delete a gang - this.plugin.getGangsService().deleteGangAsync(gang); + this.plugin.getGangsService().deleteGangAsync(gang); // Use async method this.gangs.remove(gang.getUuid()); Players.all().forEach(player1 -> PlayerUtils.sendMessage(player1, this.plugin.getConfig().getMessage("gang-disband-broadcast").replace("%gang%", gang.getName()).replace("%player%", player.getName()))); @@ -378,6 +377,7 @@ public class GangsManager { + // public void disbandGang(Player player, Gang gang, boolean force) { // // if (!gang.isOwner(player) && !force) { diff --git a/src/main/java/dev/drawethree/xprison/gangs/repo/impl/GangsRepositoryImpl.java b/src/main/java/dev/drawethree/xprison/gangs/repo/impl/GangsRepositoryImpl.java index d9709b7..3f898f7 100644 --- a/src/main/java/dev/drawethree/xprison/gangs/repo/impl/GangsRepositoryImpl.java +++ b/src/main/java/dev/drawethree/xprison/gangs/repo/impl/GangsRepositoryImpl.java @@ -110,11 +110,19 @@ public class GangsRepositoryImpl implements GangsRepository { @Override public void deleteGang(Gang g) { - this.database.executeSqlAsync("DELETE FROM " + TABLE_NAME + " WHERE ?=?", GANGS_UUID_COLNAME, g.getUuid().toString()); + String sql = "DELETE FROM " + TABLE_NAME + " WHERE UUID=?"; + this.database.executeSqlAsync(sql, g.getUuid().toString()); for (GangInvitation gangInvitation : g.getPendingInvites()) { this.deleteGangInvitation(gangInvitation); } } +// @Override +// public void deleteGang(Gang g) { +// this.database.executeSqlAsync("DELETE FROM " + TABLE_NAME + " WHERE ?=?", GANGS_UUID_COLNAME, g.getUuid().toString()); +// for (GangInvitation gangInvitation : g.getPendingInvites()) { +// this.deleteGangInvitation(gangInvitation); +// } +// } @Override diff --git a/target/X-Prison-1.13.1-shaded.jar b/target/X-Prison-1.13.1-shaded.jar deleted file mode 100644 index cbdc401..0000000 Binary files a/target/X-Prison-1.13.1-shaded.jar and /dev/null differ diff --git a/target/XPrison-1.13.1.jar b/target/XPrison-1.13.1.jar deleted file mode 100644 index cbdc401..0000000 Binary files a/target/XPrison-1.13.1.jar and /dev/null differ diff --git a/target/classes/dev/drawethree/xprison/gangs/managers/GangsManager.class b/target/classes/dev/drawethree/xprison/gangs/managers/GangsManager.class index 8b59394..66f795f 100644 Binary files a/target/classes/dev/drawethree/xprison/gangs/managers/GangsManager.class and b/target/classes/dev/drawethree/xprison/gangs/managers/GangsManager.class differ diff --git a/target/classes/dev/drawethree/xprison/gangs/repo/impl/GangsRepositoryImpl.class b/target/classes/dev/drawethree/xprison/gangs/repo/impl/GangsRepositoryImpl.class index 99659b7..e7bcbbb 100644 Binary files a/target/classes/dev/drawethree/xprison/gangs/repo/impl/GangsRepositoryImpl.class and b/target/classes/dev/drawethree/xprison/gangs/repo/impl/GangsRepositoryImpl.class differ diff --git a/target/classes/dev/drawethree/xprison/gangs/service/GangsService.class b/target/classes/dev/drawethree/xprison/gangs/service/GangsService.class index dd703c6..edd49a3 100644 Binary files a/target/classes/dev/drawethree/xprison/gangs/service/GangsService.class and b/target/classes/dev/drawethree/xprison/gangs/service/GangsService.class differ diff --git a/target/classes/dev/drawethree/xprison/gangs/service/impl/GangsServiceImpl.class b/target/classes/dev/drawethree/xprison/gangs/service/impl/GangsServiceImpl.class index d5a517e..1a5a392 100644 Binary files a/target/classes/dev/drawethree/xprison/gangs/service/impl/GangsServiceImpl.class and b/target/classes/dev/drawethree/xprison/gangs/service/impl/GangsServiceImpl.class differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index cce6fb1..8953b2a 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,5 +1,5 @@ name: X-Prison -version: 1.13.1 +version: 1.13.2 main: dev.drawethree.xprison.XPrison depend: [ Vault, WorldGuard, WorldEdit, helper ] softdepend: diff --git a/target/original-XPrison-1.13.1.jar b/target/original-XPrison-1.13.1.jar deleted file mode 100644 index 2a9e968..0000000 Binary files a/target/original-XPrison-1.13.1.jar and /dev/null differ