From 4db8346de12915ca1fa4e6c946ee77c57a41b23e Mon Sep 17 00:00:00 2001 From: bloodshot Date: Fri, 13 Nov 2020 21:49:02 -0500 Subject: [PATCH] Another round of fixes. * Fix NPE when creating subdivision using WorldEdit. Fixes #297 * Fix NPE when executing '/claimrent info' in non-rented claims. Fixes #300 * Fix TrustClaimEvent Add/Remove events not triggering. Fixes #234 * Fix TransferClaimEvent not being cancellable. Fixes #233 * Fix WE CUI visuals not showing when calling visual apply. * Fix visualization types not changing on setType call. * Add '%owneruuid%' support to DynmapProvider. Fixes #271 * Update GriefDefenderAPI for TransferClaimEvent fix. --- GriefDefenderAPI | 2 +- .../java/com/griefdefender/GDPlayerData.java | 1 + .../java/com/griefdefender/claim/GDClaim.java | 2 +- .../command/CommandClaimContract.java | 3 -- .../command/CommandClaimCreate.java | 4 --- .../command/CommandClaimExpand.java | 3 -- .../command/CommandClaimInvestigate.java | 5 ++- .../command/CommandClaimRent.java | 2 +- .../category/DynmapCategory.java | 1 + .../event/GDTrustClaimEvent.java | 22 ++++++++++++ .../event/GDUserTrustClaimEvent.java | 30 ++++++++++++---- .../listener/PlayerEventHandler.java | 34 ++++++++----------- .../provider/DynmapProvider.java | 1 + .../task/ClaimVisualApplyTask.java | 4 +++ .../com/griefdefender/util/EconomyUtil.java | 4 --- bukkit/src/main/resources/1.12.2.json | 12 +++---- bukkit/src/main/resources/1.13.2.json | 12 +++---- bukkit/src/main/resources/1.14.2.json | 12 +++---- bukkit/src/main/resources/1.14.3.json | 12 +++---- bukkit/src/main/resources/1.14.4.json | 12 +++---- bukkit/src/main/resources/1.15.2.json | 12 +++---- bukkit/src/main/resources/1.15.json | 12 +++---- bukkit/src/main/resources/1.16.1.json | 12 +++---- bukkit/src/main/resources/1.16.2.json | 12 +++---- bukkit/src/main/resources/1.16.4.json | 12 +++---- bukkit/src/main/resources/1.8.8.json | 12 +++---- gradle.properties | 6 ++-- .../java/com/griefdefender/GDPlayerData.java | 1 + .../command/CommandClaimContract.java | 3 -- .../command/CommandClaimCreate.java | 4 --- .../command/CommandClaimExpand.java | 3 -- .../command/CommandClaimInvestigate.java | 5 ++- .../command/CommandClaimRent.java | 2 +- .../event/GDTrustClaimEvent.java | 22 ++++++++++++ .../event/GDUserTrustClaimEvent.java | 30 ++++++++++++---- .../listener/PlayerEventHandler.java | 32 +++++++---------- .../task/ClaimVisualApplyTask.java | 4 +++ .../com/griefdefender/util/EconomyUtil.java | 4 --- sponge/src/main/resources/1.12.2.json | 12 +++---- 39 files changed, 213 insertions(+), 165 deletions(-) diff --git a/GriefDefenderAPI b/GriefDefenderAPI index 33bd795..f1b2d4f 160000 --- a/GriefDefenderAPI +++ b/GriefDefenderAPI @@ -1 +1 @@ -Subproject commit 33bd795ad41a886b58066b3d82759b7d1f89b854 +Subproject commit f1b2d4fc1646f06f9ef9aa6f5a07f13abb7cf60b diff --git a/bukkit/src/main/java/com/griefdefender/GDPlayerData.java b/bukkit/src/main/java/com/griefdefender/GDPlayerData.java index ca96cde..89232d7 100644 --- a/bukkit/src/main/java/com/griefdefender/GDPlayerData.java +++ b/bukkit/src/main/java/com/griefdefender/GDPlayerData.java @@ -90,6 +90,7 @@ public class GDPlayerData implements PlayerData { public Location endShovelLocation; public Location lastValidInspectLocation; public Location lastNonAirInspectLocation; + public boolean isInvestigating = false; public boolean claimMode = false; public boolean claimTool = true; public ShovelType shovelMode = ShovelTypes.BASIC; diff --git a/bukkit/src/main/java/com/griefdefender/claim/GDClaim.java b/bukkit/src/main/java/com/griefdefender/claim/GDClaim.java index 4375e19..053db3d 100644 --- a/bukkit/src/main/java/com/griefdefender/claim/GDClaim.java +++ b/bukkit/src/main/java/com/griefdefender/claim/GDClaim.java @@ -1358,7 +1358,7 @@ public ClaimResult resize(int x1, int x2, int y1, int y2, int z1, int z2) { GDChangeClaimEvent.Resize event = new GDChangeClaimEvent.Resize(this, startCorner, endCorner); GriefDefender.getEventManager().post(event); if (event.cancelled()) { - return new GDClaimResult(this, ClaimResultType.CLAIM_EVENT_CANCELLED); + return new GDClaimResult(this, ClaimResultType.CLAIM_EVENT_CANCELLED, event.getMessage().orElse(null)); } this.lesserBoundaryCorner = newLesserCorner; diff --git a/bukkit/src/main/java/com/griefdefender/command/CommandClaimContract.java b/bukkit/src/main/java/com/griefdefender/command/CommandClaimContract.java index c989486..b4fd40d 100644 --- a/bukkit/src/main/java/com/griefdefender/command/CommandClaimContract.java +++ b/bukkit/src/main/java/com/griefdefender/command/CommandClaimContract.java @@ -198,9 +198,6 @@ public void execute(Player player, int amount, @Optional String direction) { visual.createClaimBlockVisuals(player.getEyeLocation().getBlockY(), player.getLocation(), playerData); } visual.apply(player); - if (GriefDefenderPlugin.getInstance().getWorldEditProvider() != null) { - GriefDefenderPlugin.getInstance().getWorldEditProvider().displayClaimCUIVisual(claim, player, playerData, false); - } } } } diff --git a/bukkit/src/main/java/com/griefdefender/command/CommandClaimCreate.java b/bukkit/src/main/java/com/griefdefender/command/CommandClaimCreate.java index 125c2cf..57dd23e 100644 --- a/bukkit/src/main/java/com/griefdefender/command/CommandClaimCreate.java +++ b/bukkit/src/main/java/com/griefdefender/command/CommandClaimCreate.java @@ -148,10 +148,6 @@ public void execute(Player player, int radius, @Optional String type) { ImmutableMap.of( "type", gdClaim.getFriendlyNameType(true))); GriefDefenderPlugin.sendMessage(player, message); - if (GriefDefenderPlugin.getInstance().getWorldEditProvider() != null) { - GriefDefenderPlugin.getInstance().getWorldEditProvider().stopDragVisual(player); - GriefDefenderPlugin.getInstance().getWorldEditProvider().displayClaimCUIVisual(gdClaim, player, playerData, false); - } final GDClaimVisual visual = gdClaim.getVisualizer(); if (visual.getVisualTransactions().isEmpty()) { visual.createClaimBlockVisuals(location.getBlockY(), player.getLocation(), playerData); diff --git a/bukkit/src/main/java/com/griefdefender/command/CommandClaimExpand.java b/bukkit/src/main/java/com/griefdefender/command/CommandClaimExpand.java index 8f5a7a9..8b925c7 100644 --- a/bukkit/src/main/java/com/griefdefender/command/CommandClaimExpand.java +++ b/bukkit/src/main/java/com/griefdefender/command/CommandClaimExpand.java @@ -198,9 +198,6 @@ public void execute(Player player, int amount, @Optional String direction) { visual.createClaimBlockVisuals(player.getEyeLocation().getBlockY(), player.getLocation(), playerData); } visual.apply(player); - if (GriefDefenderPlugin.getInstance().getWorldEditProvider() != null) { - GriefDefenderPlugin.getInstance().getWorldEditProvider().displayClaimCUIVisual(claim, player, playerData, false); - } } } } diff --git a/bukkit/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java b/bukkit/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java index e8aad01..9754512 100644 --- a/bukkit/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java +++ b/bukkit/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java @@ -192,11 +192,10 @@ public void execute(Player player, @Optional String cmd) { if (claim != null) { // always show visual borders for resize purposes final GDClaimVisual visual = claim.getVisualizer(); + playerData.isInvestigating = true; visual.createClaimBlockVisuals(playerData.getClaimCreateMode() == CreateModeTypes.VOLUME ? height : PlayerUtil.getInstance().getEyeHeight(player), player.getLocation(), playerData); visual.apply(player); - if (worldEditProvider != null) { - worldEditProvider.displayClaimCUIVisual(claim, player, playerData, true); - } + playerData.isInvestigating = false; Set claims = new HashSet<>(); claims.add(claim); playerData.showNoClaimsFoundMessage = false; diff --git a/bukkit/src/main/java/com/griefdefender/command/CommandClaimRent.java b/bukkit/src/main/java/com/griefdefender/command/CommandClaimRent.java index a0edf40..88c776e 100644 --- a/bukkit/src/main/java/com/griefdefender/command/CommandClaimRent.java +++ b/bukkit/src/main/java/com/griefdefender/command/CommandClaimRent.java @@ -284,7 +284,7 @@ public void execute(Player player, @Optional String[] args) { final int max = claim.getEconomyData().getRentMaxTime(); Component maxTime = null; Component minTime = null; - if (max > 0) { + if (max > 0 && claim.getEconomyData().getRentEndDate() != null) { maxTime = EconomyUtil.getInstance().getUserTimeRemaining(claim.getEconomyData().getRentEndDate(), MessageCache.getInstance().RENT_UI_END_DATE); } if (min > 0) { diff --git a/bukkit/src/main/java/com/griefdefender/configuration/category/DynmapCategory.java b/bukkit/src/main/java/com/griefdefender/configuration/category/DynmapCategory.java index 8054dca..98aef42 100644 --- a/bukkit/src/main/java/com/griefdefender/configuration/category/DynmapCategory.java +++ b/bukkit/src/main/java/com/griefdefender/configuration/category/DynmapCategory.java @@ -67,6 +67,7 @@ public class DynmapCategory { public String infoWindowBasic = "
" + "Name: %claimname%
" + "Owner: %owner%
" + + "OwnerUUID: %owneruuid%
" + "Type: %gdtype%
" + "Last Seen: %lastseen%
" + "Permission Trust: %managers%
" diff --git a/bukkit/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java b/bukkit/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java index 6eb4896..c7a4024 100644 --- a/bukkit/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java +++ b/bukkit/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java @@ -48,4 +48,26 @@ public GDTrustClaimEvent(List claims, TrustType trustType) { public TrustType getTrustType() { return this.trustType; } + + public static class Add extends GDTrustClaimEvent implements TrustClaimEvent.Add { + + public Add(Claim claim, TrustType trustType) { + super(claim, trustType); + } + + public Add(List claims, TrustType trustType) { + super(claims, trustType); + } + } + + public static class Remove extends GDTrustClaimEvent implements TrustClaimEvent.Remove { + + public Remove(Claim claim, TrustType trustType) { + super(claim, trustType); + } + + public Remove(List claims, TrustType trustType) { + super(claims, trustType); + } + } } diff --git a/bukkit/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java b/bukkit/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java index 566c8b8..7f53f71 100644 --- a/bukkit/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java +++ b/bukkit/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java @@ -50,23 +50,41 @@ public List getUsers() { return this.users; } - public static class Add extends GDUserTrustClaimEvent implements UserTrustClaimEvent.Add { + public static class Add extends GDTrustClaimEvent.Add implements UserTrustClaimEvent.Add { + private List users; + public Add(List claims, List users, TrustType trustType) { - super(claims, users, trustType); + super(claims, trustType); + this.users = users; } public Add(Claim claim, List users, TrustType trustType) { - super(claim, users, trustType); + super(claim, trustType); + this.users = users; + } + + @Override + public List getUsers() { + return this.users; } } - public static class Remove extends GDUserTrustClaimEvent implements UserTrustClaimEvent.Remove { + public static class Remove extends GDTrustClaimEvent.Remove implements UserTrustClaimEvent.Remove { + private List users; + public Remove(List claims,List users, TrustType trustType) { - super(claims, users, trustType); + super(claims, trustType); + this.users = users; } public Remove(Claim claim, List users, TrustType trustType) { - super(claim, users, trustType); + super(claim, trustType); + this.users = users; + } + + @Override + public List getUsers() { + return this.users; } } } diff --git a/bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java b/bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java index 566bad5..299855f 100644 --- a/bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java +++ b/bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java @@ -328,11 +328,6 @@ public void onPlayerChangeHeldItem(PlayerItemHeldEvent event) { playerData.endShovelLocation = null; playerData.claimResizing = null; playerData.claimSubdividing = null; - // always reset to basic claims mode - if (playerData.shovelMode != ShovelTypes.BASIC) { - playerData.shovelMode = ShovelTypes.BASIC; - GriefDefenderPlugin.sendMessage(player, MessageCache.getInstance().MODE_BASIC); - } if (GriefDefenderPlugin.CLAIM_BLOCK_SYSTEM == ClaimBlockSystem.VOLUME) { final Component message = GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.PLAYER_REMAINING_BLOCKS_3D, @@ -539,7 +534,9 @@ public void onPlayerInteractItem(PlayerInteractEvent event) { final Flag flag = primaryEvent ? Flags.INTERACT_ITEM_PRIMARY : Flags.INTERACT_ITEM_SECONDARY; final String itemId = GDPermissionManager.getInstance().getPermissionIdentifier(itemInHand); if ((playerData.claimMode && (NMSUtil.getInstance().isMainHand(event) && event.getAction() == Action.LEFT_CLICK_AIR|| event.getAction() == Action.LEFT_CLICK_BLOCK)) || (!playerData.claimMode && playerData.claimTool && GriefDefenderPlugin.getInstance().investigationTool != null && itemId.equalsIgnoreCase(GriefDefenderPlugin.getInstance().investigationTool))) { + playerData.isInvestigating = true; investigateClaim(event, player, clickedBlock, itemInHand); + playerData.isInvestigating = false; event.setCancelled(true); return; } @@ -1345,10 +1342,6 @@ private void createClaimFinish(PlayerInteractEvent event, Player player, Locatio ImmutableMap.of( "type", gdClaim.getFriendlyNameType(true))); GriefDefenderPlugin.sendMessage(player, message); - if (this.worldEditProvider != null) { - this.worldEditProvider.stopDragVisual(player); - this.worldEditProvider.displayClaimCUIVisual(gdClaim, player, playerData, false); - } playerData.revertTempVisuals(); final GDClaimVisual visual = gdClaim.getVisualizer(); if (visual.getVisualTransactions().isEmpty()) { @@ -1448,10 +1441,6 @@ private void createSubdivisionFinish(PlayerInteractEvent event, Player player, L visual.createClaimBlockVisuals(location.getBlockY(), player.getLocation(), playerData); } visual.apply(player, false); - if (this.worldEditProvider != null) { - this.worldEditProvider.stopDragVisual(player); - this.worldEditProvider.displayClaimCUIVisual(gdClaim, player, playerData, false); - } playerData.claimSubdividing = null; playerData.claimResizing = null; playerData.lastShovelLocation = null; @@ -1506,7 +1495,7 @@ private void handleResizeStart(PlayerInteractEvent event, Player player, Locatio final int x = playerData.lastShovelLocation.getBlockX() == claim.lesserBoundaryCorner.getX() ? claim.greaterBoundaryCorner.getX() : claim.lesserBoundaryCorner.getX(); final int y = playerData.lastShovelLocation.getBlockY() == claim.lesserBoundaryCorner.getY() ? claim.greaterBoundaryCorner.getY() : claim.lesserBoundaryCorner.getY(); final int z = playerData.lastShovelLocation.getBlockZ() == claim.lesserBoundaryCorner.getZ() ? claim.greaterBoundaryCorner.getZ() : claim.lesserBoundaryCorner.getZ(); - this.worldEditProvider.displayClaimCUIVisual(claim, new Vector3i(x, y, z), VecHelper.toVector3i(playerData.lastShovelLocation), player, playerData, false); + this.worldEditProvider.displayClaimCUIVisual(claim, new Vector3i(x, y, z), VecHelper.toVector3i(playerData.lastShovelLocation), player, playerData); } // Show visual block for resize corner click playerData.revertTempVisuals(); @@ -1620,9 +1609,6 @@ private void handleResizeFinish(PlayerInteractEvent event, Player player, Locati visual.resetVisuals(); visual.createClaimBlockVisuals(location.getBlockY(), player.getLocation(), playerData); visual.apply(player); - if (this.worldEditProvider != null) { - this.worldEditProvider.displayClaimCUIVisual(claim, player, playerData, false); - } } else { if (claimResult.getResultType() == ClaimResultType.OVERLAPPING_CLAIM) { GDClaim overlapClaim = (GDClaim) claimResult.getClaim().get(); @@ -1632,6 +1618,17 @@ private void handleResizeFinish(PlayerInteractEvent event, Player player, Locati CommandHelper.showOverlapClaims(player, claims, location.getBlockY()); } + if (claimResult.getResultType() == ClaimResultType.CLAIM_EVENT_CANCELLED) { + if (claimResult.getMessage().isPresent()) { + GriefDefenderPlugin.sendMessage(player, claimResult.getMessage().get()); + } + playerData.claimResizing.resetVisuals(); + playerData.revertTempVisuals(); + playerData.claimSubdividing = null; + playerData.lastShovelLocation = null; + playerData.endShovelLocation = null; + playerData.claimResizing = null; + } event.setCancelled(true); } } @@ -1763,9 +1760,6 @@ private boolean investigateClaim(PlayerInteractEvent event, Player player, Block final GDClaimVisual visual = claim.getVisualizer(); visual.createClaimBlockVisuals(playerData.getClaimCreateMode() == CreateModeTypes.VOLUME ? height : PlayerUtil.getInstance().getEyeHeight(player), player.getLocation(), playerData); visual.apply(player); - if (this.worldEditProvider != null) { - worldEditProvider.displayClaimCUIVisual(claim, player, playerData, true); - } Set claims = new HashSet<>(); claims.add(claim); playerData.showNoClaimsFoundMessage = false; diff --git a/bukkit/src/main/java/com/griefdefender/provider/DynmapProvider.java b/bukkit/src/main/java/com/griefdefender/provider/DynmapProvider.java index bed1f1a..398e3d1 100644 --- a/bukkit/src/main/java/com/griefdefender/provider/DynmapProvider.java +++ b/bukkit/src/main/java/com/griefdefender/provider/DynmapProvider.java @@ -92,6 +92,7 @@ private String getWindowInfo(Claim claim, AreaMarker marker) { info = "
" + this.cfg.infoWindowBasic + "
"; } info = info.replace("%owner%", ((GDClaim) claim).getOwnerName()); + info = info.replace("%owneruuid%", claim.getOwnerUniqueId().toString()); info = info.replace("%area%", Integer.toString(claim.getArea())); info = info.replace("%claimname%", claim.getData().getName().isPresent() diff --git a/bukkit/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java b/bukkit/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java index 8867708..91b9494 100644 --- a/bukkit/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java +++ b/bukkit/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java @@ -109,6 +109,10 @@ public void run() { this.playerData.createBlockVisualTransactions.put(visualUniqueId, new ArrayList<>(this.visualization.getVisualTransactions())); this.playerData.createBlockVisualRevertRunnables.put(visualUniqueId, runnable); } + if (this.visualization.getClaim() != null && GriefDefenderPlugin.getInstance().getWorldEditProvider() != null) { + GriefDefenderPlugin.getInstance().getWorldEditProvider().stopDragVisual(this.player); + GriefDefenderPlugin.getInstance().getWorldEditProvider().displayClaimCUIVisual(this.visualization.getClaim(), this.player, this.playerData); + } this.playerData.claimVisualRevertTasks.put(visualUniqueId, Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(GDBootstrap.getInstance(), runnable, tickTime)); } } diff --git a/bukkit/src/main/java/com/griefdefender/util/EconomyUtil.java b/bukkit/src/main/java/com/griefdefender/util/EconomyUtil.java index 7229cd0..9e7fa9d 100644 --- a/bukkit/src/main/java/com/griefdefender/util/EconomyUtil.java +++ b/bukkit/src/main/java/com/griefdefender/util/EconomyUtil.java @@ -174,10 +174,6 @@ private Consumer economyClaimBuyConfirmed(Player player, GDPlayer "type", gdClaim.getFriendlyNameType(true))); GriefDefenderPlugin.sendMessage(player, message); final GDWorldEditProvider worldEditProvider = GriefDefenderPlugin.getInstance().getWorldEditProvider(); - if (worldEditProvider != null) { - worldEditProvider.stopDragVisual(player); - worldEditProvider.displayClaimCUIVisual(gdClaim, player, playerData, false); - } final GDClaimVisual visual = gdClaim.getVisualizer(); if (visual.getVisualTransactions().isEmpty()) { visual.createClaimBlockVisuals(height, player.getLocation(), playerData); diff --git a/bukkit/src/main/resources/1.12.2.json b/bukkit/src/main/resources/1.12.2.json index bc9e138..e7d25dd 100644 --- a/bukkit/src/main/resources/1.12.2.json +++ b/bukkit/src/main/resources/1.12.2.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.12.2", - "sha1": "ec24281ca279a99a7ae26e55e8a0a8877632fbc5", - "path": "com/griefdefender/adapter/1.12.2-SNAPSHOT/adapter-1.12.2-20200815.181857-48.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.12.2-SNAPSHOT/adapter-1.12.2-20200815.181857-48.jar" + "sha1": "ff8cf01a85b52f8f07f0b07500489c6cf06885dc", + "path": "com/griefdefender/adapter/1.12.2-SNAPSHOT/adapter-1.12.2-20201114.023606-49.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.12.2-SNAPSHOT/adapter-1.12.2-20201114.023606-49.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.13.2.json b/bukkit/src/main/resources/1.13.2.json index 6e66394..6fc5f7f 100644 --- a/bukkit/src/main/resources/1.13.2.json +++ b/bukkit/src/main/resources/1.13.2.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.13.2", - "sha1": "b0d4103d5163e36729e61c6ce31a614dcd5e479d", - "path": "com/griefdefender/adapter/1.13.2-SNAPSHOT/adapter-1.13.2-20200815.181639-46.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.13.2-SNAPSHOT/adapter-1.13.2-20200815.181639-46.jar" + "sha1": "b8f588f31e1d09fba8998557f868fcd47b11a102", + "path": "com/griefdefender/adapter/1.13.2-SNAPSHOT/adapter-1.13.2-20201114.022735-47.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.13.2-SNAPSHOT/adapter-1.13.2-20201114.022735-47.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.14.2.json b/bukkit/src/main/resources/1.14.2.json index 4e1732b..8cb39a2 100644 --- a/bukkit/src/main/resources/1.14.2.json +++ b/bukkit/src/main/resources/1.14.2.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.14.2", - "sha1": "66194045c0dc7dba2451220a5ae0b81d0657f6f8", - "path": "com/griefdefender/adapter/1.14.2-SNAPSHOT/adapter-1.14.2-20200815.181604-46.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.14.2-SNAPSHOT/adapter-1.14.2-20200815.181604-46.jar" + "sha1": "b19c58ca092ff22c0beef649d79f95c21677871b", + "path": "com/griefdefender/adapter/1.14.2-SNAPSHOT/adapter-1.14.2-20201114.021619-47.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.14.2-SNAPSHOT/adapter-1.14.2-20201114.021619-47.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.14.3.json b/bukkit/src/main/resources/1.14.3.json index 23f9dc5..064a613 100644 --- a/bukkit/src/main/resources/1.14.3.json +++ b/bukkit/src/main/resources/1.14.3.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.14.3", - "sha1": "f76f3af9978ec81abf65d48bd3852a04d5fbe5fe", - "path": "com/griefdefender/adapter/1.14.3-SNAPSHOT/adapter-1.14.3-20200815.181527-48.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.14.3-SNAPSHOT/adapter-1.14.3-20200815.181527-48.jar" + "sha1": "e168e41140545240e196858fdf8d982f5d93bd58", + "path": "com/griefdefender/adapter/1.14.3-SNAPSHOT/adapter-1.14.3-20201114.021212-49.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.14.3-SNAPSHOT/adapter-1.14.3-20201114.021212-49.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.14.4.json b/bukkit/src/main/resources/1.14.4.json index 6a2a20e..50bc6cb 100644 --- a/bukkit/src/main/resources/1.14.4.json +++ b/bukkit/src/main/resources/1.14.4.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.14.4", - "sha1": "c2290d6f4cec30b2fd3d7ae95e4186f7c5493bf4", - "path": "com/griefdefender/adapter/1.14.4-SNAPSHOT/adapter-1.14.4-20200815.181454-46.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.14.4-SNAPSHOT/adapter-1.14.4-20200815.181454-46.jar" + "sha1": "6a7495ebd84a02eff57d9ad4d1dd5651ebf69374", + "path": "com/griefdefender/adapter/1.14.4-SNAPSHOT/adapter-1.14.4-20201114.021020-47.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.14.4-SNAPSHOT/adapter-1.14.4-20201114.021020-47.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.15.2.json b/bukkit/src/main/resources/1.15.2.json index e82ea1c..76603d1 100644 --- a/bukkit/src/main/resources/1.15.2.json +++ b/bukkit/src/main/resources/1.15.2.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.15.2", - "sha1": "464541f3ea442ed7f272c12965b0be0107166e8a", - "path": "com/griefdefender/adapter/1.15.2-SNAPSHOT/adapter-1.15.2-20200815.181347-29.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.15.2-SNAPSHOT/adapter-1.15.2-20200815.181347-29.jar" + "sha1": "d0200bbdd86597119ae3b945454ccd642343d406", + "path": "com/griefdefender/adapter/1.15.2-SNAPSHOT/adapter-1.15.2-20201114.020309-30.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.15.2-SNAPSHOT/adapter-1.15.2-20201114.020309-30.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.15.json b/bukkit/src/main/resources/1.15.json index d22ced5..70cedf1 100644 --- a/bukkit/src/main/resources/1.15.json +++ b/bukkit/src/main/resources/1.15.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.15", - "sha1": "f689a443852fefa7462d3154999ea624a8756046", - "path": "com/griefdefender/adapter/1.15-SNAPSHOT/adapter-1.15-20200815.181416-29.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.15-SNAPSHOT/adapter-1.15-20200815.181416-29.jar" + "sha1": "e91f93c0381be8e8bd3d3ea09d0ddb0eeba487d6", + "path": "com/griefdefender/adapter/1.15-SNAPSHOT/adapter-1.15-20201114.020556-30.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.15-SNAPSHOT/adapter-1.15-20201114.020556-30.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.16.1.json b/bukkit/src/main/resources/1.16.1.json index dd955b2..5b6ad11 100644 --- a/bukkit/src/main/resources/1.16.1.json +++ b/bukkit/src/main/resources/1.16.1.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.16.1", - "sha1": "da96fb3001c4a0d866e9b3715aaee6335a881bb0", - "path": "com/griefdefender/adapter/1.16.1-SNAPSHOT/adapter-1.16.1-20200815.181259-9.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.16.1-SNAPSHOT/adapter-1.16.1-20200815.181259-9.jar" + "sha1": "ea905b3efa9c21c90422ea005baeeea25252a04a", + "path": "com/griefdefender/adapter/1.16.1-SNAPSHOT/adapter-1.16.1-20201114.014103-10.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.16.1-SNAPSHOT/adapter-1.16.1-20201114.014103-10.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.16.2.json b/bukkit/src/main/resources/1.16.2.json index 19f9e1d..f247d1e 100644 --- a/bukkit/src/main/resources/1.16.2.json +++ b/bukkit/src/main/resources/1.16.2.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.16.2", - "sha1": "01a80ffbcd5b7dec1948faf82f1270abfff5c1e8", - "path": "com/griefdefender/adapter/1.16.2-SNAPSHOT/adapter-1.16.2-20200815.181223-2.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.16.2-SNAPSHOT/adapter-1.16.2-20200815.181223-2.jar" + "sha1": "604406c516a85a22d2be5d5cf299022e7d741ce6", + "path": "com/griefdefender/adapter/1.16.2-SNAPSHOT/adapter-1.16.2-20201114.013638-3.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.16.2-SNAPSHOT/adapter-1.16.2-20201114.013638-3.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.16.4.json b/bukkit/src/main/resources/1.16.4.json index ed71de7..ba5a7ca 100644 --- a/bukkit/src/main/resources/1.16.4.json +++ b/bukkit/src/main/resources/1.16.4.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.16.4", - "sha1": "bf1cc779f44f3dd6e8f192e8ed60b9081f488181", - "path": "com/griefdefender/adapter/1.16.4-SNAPSHOT/adapter-1.16.4-20201104.063714-1.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.16.4-SNAPSHOT/adapter-1.16.4-20201104.063714-1.jar" + "sha1": "c614e94ab107870b600c810f095c8e49e0eef816", + "path": "com/griefdefender/adapter/1.16.4-SNAPSHOT/adapter-1.16.4-20201114.010319-2.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.16.4-SNAPSHOT/adapter-1.16.4-20201114.010319-2.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/bukkit/src/main/resources/1.8.8.json b/bukkit/src/main/resources/1.8.8.json index 9c34a29..4a0c94b 100644 --- a/bukkit/src/main/resources/1.8.8.json +++ b/bukkit/src/main/resources/1.8.8.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter:1.8.8", - "sha1": "afbe175884a0703974df792de5452287e9f48cb8", - "path": "com/griefdefender/adapter/1.8.8-SNAPSHOT/adapter-1.8.8-20200815.181931-46.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.8.8-SNAPSHOT/adapter-1.8.8-20200815.181931-46.jar" + "sha1": "c04d370eeb09f0880ee93ada5ba832a24ade4d42", + "path": "com/griefdefender/adapter/1.8.8-SNAPSHOT/adapter-1.8.8-20201114.024042-47.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter/1.8.8-SNAPSHOT/adapter-1.8.8-20201114.024042-47.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0", diff --git a/gradle.properties b/gradle.properties index dbca7ad..68f165a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ name=GriefDefender group=com.griefdefender url=https://github.com/bloodmc/GriefDefender version=1.5.4-DEV -apiVersion=1.0.0-20200528.202302-24 +apiVersion=1.0.0-20201114.003714-25 # Bukkit -adapterVersion=1.16.4-20201104.063714-1 +adapterVersion=1.16.4-20201114.010319-2 spigotVersion=1.16.4-R0.1-SNAPSHOT # Sponge -adapterSpongeVersion=1.12.2-20200627.042712-12 +adapterSpongeVersion=1.12.2-20201114.012057-13 commonVersion=1.12.2-7.1.7-SNAPSHOT minecraftVersion=1.12.2 mcpMappings=snapshot_20180808 diff --git a/sponge/src/main/java/com/griefdefender/GDPlayerData.java b/sponge/src/main/java/com/griefdefender/GDPlayerData.java index 0240276..8ca1d7f 100644 --- a/sponge/src/main/java/com/griefdefender/GDPlayerData.java +++ b/sponge/src/main/java/com/griefdefender/GDPlayerData.java @@ -93,6 +93,7 @@ public class GDPlayerData implements PlayerData { public Location endShovelLocation; public Location lastValidInspectLocation; public Location lastNonAirInspectLocation; + public boolean isInvestigating = false; public boolean claimMode = false; public boolean claimTool = true; public ShovelType shovelMode = ShovelTypes.BASIC; diff --git a/sponge/src/main/java/com/griefdefender/command/CommandClaimContract.java b/sponge/src/main/java/com/griefdefender/command/CommandClaimContract.java index 2eaa392..48f2ef0 100644 --- a/sponge/src/main/java/com/griefdefender/command/CommandClaimContract.java +++ b/sponge/src/main/java/com/griefdefender/command/CommandClaimContract.java @@ -202,9 +202,6 @@ public void execute(Player player, int amount, @Optional String direction) { visual.createClaimBlockVisuals(PlayerUtil.getInstance().getEyeHeight(player), player.getLocation(), playerData); } visual.apply(player); - if (GriefDefenderPlugin.getInstance().getWorldEditProvider() != null) { - GriefDefenderPlugin.getInstance().getWorldEditProvider().displayClaimCUIVisual(claim, player, playerData, false); - } } } } diff --git a/sponge/src/main/java/com/griefdefender/command/CommandClaimCreate.java b/sponge/src/main/java/com/griefdefender/command/CommandClaimCreate.java index c621658..0e8b020 100644 --- a/sponge/src/main/java/com/griefdefender/command/CommandClaimCreate.java +++ b/sponge/src/main/java/com/griefdefender/command/CommandClaimCreate.java @@ -147,10 +147,6 @@ public void execute(Player player, int radius, @Optional String type) { ImmutableMap.of( "type", gdClaim.getFriendlyNameType(true))); GriefDefenderPlugin.sendMessage(player, message); - if (GriefDefenderPlugin.getInstance().getWorldEditProvider() != null) { - GriefDefenderPlugin.getInstance().getWorldEditProvider().stopDragVisual(player); - GriefDefenderPlugin.getInstance().getWorldEditProvider().displayClaimCUIVisual(gdClaim, player, playerData, false); - } final GDClaimVisual visual = gdClaim.getVisualizer(); if (visual.getVisualTransactions().isEmpty()) { visual.createClaimBlockVisuals(location.getBlockY(), player.getLocation(), playerData); diff --git a/sponge/src/main/java/com/griefdefender/command/CommandClaimExpand.java b/sponge/src/main/java/com/griefdefender/command/CommandClaimExpand.java index 376f2f3..ed51121 100644 --- a/sponge/src/main/java/com/griefdefender/command/CommandClaimExpand.java +++ b/sponge/src/main/java/com/griefdefender/command/CommandClaimExpand.java @@ -202,9 +202,6 @@ public void execute(Player player, int amount, @Optional String direction) { visual.createClaimBlockVisuals(PlayerUtil.getInstance().getEyeHeight(player), player.getLocation(), playerData); } visual.apply(player); - if (GriefDefenderPlugin.getInstance().getWorldEditProvider() != null) { - GriefDefenderPlugin.getInstance().getWorldEditProvider().displayClaimCUIVisual(claim, player, playerData, false); - } } } } diff --git a/sponge/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java b/sponge/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java index 6c9f710..9f0a522 100644 --- a/sponge/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java +++ b/sponge/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java @@ -189,11 +189,10 @@ public void execute(Player player, @Optional String cmd) { if (claim != null) { // always show visual borders for resize purposes final GDClaimVisual visual = claim.getVisualizer(); + playerData.isInvestigating = true; visual.createClaimBlockVisuals(playerData.getClaimCreateMode() == CreateModeTypes.VOLUME ? height : PlayerUtil.getInstance().getEyeHeight(player), player.getLocation(), playerData); visual.apply(player); - if (worldEditProvider != null) { - worldEditProvider.displayClaimCUIVisual(claim, player, playerData, true); - } + playerData.isInvestigating = false; Set claims = new HashSet<>(); claims.add(claim); playerData.showNoClaimsFoundMessage = false; diff --git a/sponge/src/main/java/com/griefdefender/command/CommandClaimRent.java b/sponge/src/main/java/com/griefdefender/command/CommandClaimRent.java index 6e53151..1902507 100644 --- a/sponge/src/main/java/com/griefdefender/command/CommandClaimRent.java +++ b/sponge/src/main/java/com/griefdefender/command/CommandClaimRent.java @@ -292,7 +292,7 @@ public void execute(Player player, @Optional String[] args) { final int max = claim.getEconomyData().getRentMaxTime(); Component maxTime = null; Component minTime = null; - if (max > 0) { + if (max > 0 && claim.getEconomyData().getRentEndDate() != null) { maxTime = EconomyUtil.getInstance().getUserTimeRemaining(claim.getEconomyData().getRentEndDate(), MessageCache.getInstance().RENT_UI_END_DATE); } if (min > 0) { diff --git a/sponge/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java b/sponge/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java index 6eb4896..c7a4024 100644 --- a/sponge/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java +++ b/sponge/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java @@ -48,4 +48,26 @@ public GDTrustClaimEvent(List claims, TrustType trustType) { public TrustType getTrustType() { return this.trustType; } + + public static class Add extends GDTrustClaimEvent implements TrustClaimEvent.Add { + + public Add(Claim claim, TrustType trustType) { + super(claim, trustType); + } + + public Add(List claims, TrustType trustType) { + super(claims, trustType); + } + } + + public static class Remove extends GDTrustClaimEvent implements TrustClaimEvent.Remove { + + public Remove(Claim claim, TrustType trustType) { + super(claim, trustType); + } + + public Remove(List claims, TrustType trustType) { + super(claims, trustType); + } + } } diff --git a/sponge/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java b/sponge/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java index 566c8b8..7f53f71 100644 --- a/sponge/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java +++ b/sponge/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java @@ -50,23 +50,41 @@ public List getUsers() { return this.users; } - public static class Add extends GDUserTrustClaimEvent implements UserTrustClaimEvent.Add { + public static class Add extends GDTrustClaimEvent.Add implements UserTrustClaimEvent.Add { + private List users; + public Add(List claims, List users, TrustType trustType) { - super(claims, users, trustType); + super(claims, trustType); + this.users = users; } public Add(Claim claim, List users, TrustType trustType) { - super(claim, users, trustType); + super(claim, trustType); + this.users = users; + } + + @Override + public List getUsers() { + return this.users; } } - public static class Remove extends GDUserTrustClaimEvent implements UserTrustClaimEvent.Remove { + public static class Remove extends GDTrustClaimEvent.Remove implements UserTrustClaimEvent.Remove { + private List users; + public Remove(List claims,List users, TrustType trustType) { - super(claims, users, trustType); + super(claims, trustType); + this.users = users; } public Remove(Claim claim, List users, TrustType trustType) { - super(claim, users, trustType); + super(claim, trustType); + this.users = users; + } + + @Override + public List getUsers() { + return this.users; } } } diff --git a/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java b/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java index 63dd45a..846b383 100644 --- a/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java +++ b/sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java @@ -915,11 +915,6 @@ public void onPlayerChangeHeldItem(ChangeInventoryEvent.Held event, @First Playe playerData.lastShovelLocation = null; playerData.endShovelLocation = null; playerData.claimResizing = null; - // always reset to basic claims mode - if (playerData.shovelMode != ShovelTypes.BASIC) { - playerData.shovelMode = ShovelTypes.BASIC; - GriefDefenderPlugin.sendMessage(player, MessageCache.getInstance().MODE_BASIC); - } // tell him how many claim blocks he has available if (GriefDefenderPlugin.CLAIM_BLOCK_SYSTEM == ClaimBlockSystem.VOLUME) { @@ -1543,10 +1538,6 @@ private void createClaimFinish(InteractEvent event, Player player, Location claims = new HashSet<>(); claims.add(claim); playerData.showNoClaimsFoundMessage = false; diff --git a/sponge/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java b/sponge/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java index 4410108..fb361b9 100644 --- a/sponge/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java +++ b/sponge/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java @@ -109,6 +109,10 @@ public void run() { this.playerData.createBlockVisualTransactions.put(visualUniqueId, new ArrayList<>(this.visualization.getVisualTransactions())); this.playerData.createBlockVisualRevertRunnables.put(visualUniqueId, runnable); } + if (this.visualization.getClaim() != null && GriefDefenderPlugin.getInstance().getWorldEditProvider() != null) { + GriefDefenderPlugin.getInstance().getWorldEditProvider().stopDragVisual(this.player); + GriefDefenderPlugin.getInstance().getWorldEditProvider().displayClaimCUIVisual(this.visualization.getClaim(), this.player, this.playerData); + } this.playerData.claimVisualRevertTasks.put(visualUniqueId, Sponge.getGame().getScheduler().createTaskBuilder().delay(seconds, TimeUnit.SECONDS) .execute(runnable).submit(GDBootstrap.getInstance())); } diff --git a/sponge/src/main/java/com/griefdefender/util/EconomyUtil.java b/sponge/src/main/java/com/griefdefender/util/EconomyUtil.java index 60ab30d..6c74f88 100644 --- a/sponge/src/main/java/com/griefdefender/util/EconomyUtil.java +++ b/sponge/src/main/java/com/griefdefender/util/EconomyUtil.java @@ -160,10 +160,6 @@ private static Consumer economyClaimBuyConfirmed(Player player, G "type", gdClaim.getFriendlyNameType(true))); GriefDefenderPlugin.sendMessage(player, message); final GDWorldEditProvider worldEditProvider = GriefDefenderPlugin.getInstance().worldEditProvider; - if (worldEditProvider != null) { - worldEditProvider.stopDragVisual(player); - worldEditProvider.displayClaimCUIVisual(gdClaim, player, playerData, false); - } final GDClaimVisual visual = gdClaim.getVisualizer(); if (visual.getVisualTransactions().isEmpty()) { visual.createClaimBlockVisuals(height, player.getLocation(), playerData); diff --git a/sponge/src/main/resources/1.12.2.json b/sponge/src/main/resources/1.12.2.json index e0baf8c..a3aed2d 100644 --- a/sponge/src/main/resources/1.12.2.json +++ b/sponge/src/main/resources/1.12.2.json @@ -3,15 +3,15 @@ "libraries": [ { "name": "com.griefdefender:adapter-sponge:1.12.2", - "sha1": "7ae27ff6509c58ed1eacc552fc98f517e92d9fed", - "path": "com/griefdefender/adapter-sponge/1.12.2-SNAPSHOT/adapter-sponge-1.12.2-20200627.042712-12.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter-sponge/1.12.2-SNAPSHOT/adapter-sponge-1.12.2-20200627.042712-12.jar" + "sha1": "0b3bafc66738cce08ce76b468b751bb04cb2e367", + "path": "com/griefdefender/adapter-sponge/1.12.2-SNAPSHOT/adapter-sponge-1.12.2-20201114.012057-13.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/adapter-sponge/1.12.2-SNAPSHOT/adapter-sponge-1.12.2-20201114.012057-13.jar" }, { "name": "com.griefdefender:api:1.0.0", - "sha1": "2a3f820d12a3bd4c03932018567ab3732517aee5", - "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar", - "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20200528.202302-24.jar" + "sha1": "da0dc8ccd0682a439b5d215a2fb5b0d2c9049c97", + "path": "com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar", + "url": "https://repo.glaremasters.me/repository/bloodshot/com/griefdefender/api/1.0.0-SNAPSHOT/api-1.0.0-20201114.003714-25.jar" }, { "name": "com.griefdefender:reflect-helper:1.0",