Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2025-02-18 02:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Another round of fixes.

Browse Source 
* 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.
This commit is contained in:
bloodshot 2020-11-13 21:49:02 -05:00
parent 6b056d936e
commit 4db8346de1
39 changed files with 213 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GriefDefenderAPI

@ -1 +1 @@
Subproject commit 33bd795ad41a886b58066b3d82759b7d1f89b854
Subproject commit f1b2d4fc1646f06f9ef9aa6f5a07f13abb7cf60b

1
bukkit/src/main/java/com/griefdefender/GDPlayerData.java
View File

@ -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;

2
bukkit/src/main/java/com/griefdefender/claim/GDClaim.java
View File

@ -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;

3
bukkit/src/main/java/com/griefdefender/command/CommandClaimContract.java
View File

@ -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);
}
}
}
}

4
bukkit/src/main/java/com/griefdefender/command/CommandClaimCreate.java
View File

@ -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);

3
bukkit/src/main/java/com/griefdefender/command/CommandClaimExpand.java
View File

@ -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);
}
}
}
}

5
bukkit/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java
View File

@ -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<Claim> claims = new HashSet<>();
claims.add(claim);
playerData.showNoClaimsFoundMessage = false;

2
bukkit/src/main/java/com/griefdefender/command/CommandClaimRent.java
View File

@ -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) {

1
bukkit/src/main/java/com/griefdefender/configuration/category/DynmapCategory.java
View File

@ -67,6 +67,7 @@ public class DynmapCategory {
public String infoWindowBasic = "<div class=\"infowindow\">"
+ "Name: <span style=\"font-weight:bold;\">%claimname%</span><br/>"
+ "Owner: <span style=\"font-weight:bold;\">%owner%</span><br/>"
+ "OwnerUUID: <span style=\"font-weight:bold;\">%owneruuid%</span><br/>"
+ "Type: <span style=\"font-weight:bold;\">%gdtype%</span><br/>"
+ "Last Seen: <span style=\"font-weight:bold;\">%lastseen%</span><br/>"
+ "Permission Trust: <span style=\"font-weight:bold;\">%managers%</span><br/>"

22
bukkit/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java
View File

@ -48,4 +48,26 @@ public GDTrustClaimEvent(List<Claim> 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<Claim> 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<Claim> claims, TrustType trustType) {
super(claims, trustType);
}
}
}

30
bukkit/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java
View File

@ -50,23 +50,41 @@ public List<UUID> 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<UUID> users;
public Add(List<Claim> claims, List<UUID> users, TrustType trustType) {
super(claims, users, trustType);
super(claims, trustType);
this.users = users;
}
public Add(Claim claim, List<UUID> users, TrustType trustType) {
super(claim, users, trustType);
super(claim, trustType);
this.users = users;
}
@Override
public List<UUID> 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<UUID> users;
public Remove(List<Claim> claims,List<UUID> users, TrustType trustType) {
super(claims, users, trustType);
super(claims, trustType);
this.users = users;
}
public Remove(Claim claim, List<UUID> users, TrustType trustType) {
super(claim, users, trustType);
super(claim, trustType);
this.users = users;
}
@Override
public List<UUID> getUsers() {
return this.users;
}
}
}

34
bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
View File

@ -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<Claim> claims = new HashSet<>();
claims.add(claim);
playerData.showNoClaimsFoundMessage = false;

1
bukkit/src/main/java/com/griefdefender/provider/DynmapProvider.java
View File

@ -92,6 +92,7 @@ private String getWindowInfo(Claim claim, AreaMarker marker) {
info = "<div class=\"regioninfo\">" + this.cfg.infoWindowBasic + "</div>";
}
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()

4
bukkit/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java
View File

@ -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));
}
}

4
bukkit/src/main/java/com/griefdefender/util/EconomyUtil.java
View File

@ -174,10 +174,6 @@ private Consumer<CommandSender> 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);

12
bukkit/src/main/resources/1.12.2.json
View File

@ -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",

12
bukkit/src/main/resources/1.13.2.json
View File

@ -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",

12
bukkit/src/main/resources/1.14.2.json
View File

@ -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",

12
bukkit/src/main/resources/1.14.3.json
View File

@ -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",

12
bukkit/src/main/resources/1.14.4.json
View File

@ -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",

12
bukkit/src/main/resources/1.15.2.json
View File

@ -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",

12
bukkit/src/main/resources/1.15.json
View File

@ -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",

12
bukkit/src/main/resources/1.16.1.json
View File

@ -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",

12
bukkit/src/main/resources/1.16.2.json
View File

@ -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",

12
bukkit/src/main/resources/1.16.4.json
View File

@ -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",

12
bukkit/src/main/resources/1.8.8.json
View File

@ -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",

6
gradle.properties
View File

@ -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

1
sponge/src/main/java/com/griefdefender/GDPlayerData.java
View File

@ -93,6 +93,7 @@ public class GDPlayerData implements PlayerData {
public Location<World> endShovelLocation;
public Location<World> lastValidInspectLocation;
public Location<World> lastNonAirInspectLocation;
public boolean isInvestigating = false;
public boolean claimMode = false;
public boolean claimTool = true;
public ShovelType shovelMode = ShovelTypes.BASIC;

3
sponge/src/main/java/com/griefdefender/command/CommandClaimContract.java
View File

@ -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);
}
}
}
}

4
sponge/src/main/java/com/griefdefender/command/CommandClaimCreate.java
View File

@ -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);

3
sponge/src/main/java/com/griefdefender/command/CommandClaimExpand.java
View File

@ -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);
}
}
}
}

5
sponge/src/main/java/com/griefdefender/command/CommandClaimInvestigate.java
View File

@ -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<Claim> claims = new HashSet<>();
claims.add(claim);
playerData.showNoClaimsFoundMessage = false;

2
sponge/src/main/java/com/griefdefender/command/CommandClaimRent.java
View File

@ -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) {

22
sponge/src/main/java/com/griefdefender/event/GDTrustClaimEvent.java
View File

@ -48,4 +48,26 @@ public GDTrustClaimEvent(List<Claim> 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<Claim> 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<Claim> claims, TrustType trustType) {
super(claims, trustType);
}
}
}

30
sponge/src/main/java/com/griefdefender/event/GDUserTrustClaimEvent.java
View File

@ -50,23 +50,41 @@ public List<UUID> 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<UUID> users;
public Add(List<Claim> claims, List<UUID> users, TrustType trustType) {
super(claims, users, trustType);
super(claims, trustType);
this.users = users;
}
public Add(Claim claim, List<UUID> users, TrustType trustType) {
super(claim, users, trustType);
super(claim, trustType);
this.users = users;
}
@Override
public List<UUID> 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<UUID> users;
public Remove(List<Claim> claims,List<UUID> users, TrustType trustType) {
super(claims, users, trustType);
super(claims, trustType);
this.users = users;
}
public Remove(Claim claim, List<UUID> users, TrustType trustType) {
super(claim, users, trustType);
super(claim, trustType);
this.users = users;
}
@Override
public List<UUID> getUsers() {
return this.users;
}
}
}

32
sponge/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
View File

@ -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<Worl
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()) {
@ -1647,10 +1638,6 @@ private void createSubdivisionFinish(InteractEvent event, Player player, Locatio
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;
@ -1705,7 +1692,7 @@ private void handleResizeStart(InteractEvent event, Player player, Location<Worl
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), playerData.lastShovelLocation.getBlockPosition(), player, playerData, false);
this.worldEditProvider.displayClaimCUIVisual(claim, new Vector3i(x, y, z), playerData.lastShovelLocation.getBlockPosition(), player, playerData);
}
// Show visual block for resize corner click
playerData.revertTempVisuals();
@ -1823,9 +1810,6 @@ private void handleResizeFinish(InteractEvent event, Player player, Location<Wor
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();
@ -1835,6 +1819,17 @@ private void handleResizeFinish(InteractEvent event, Player player, Location<Wor
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);
}
}
@ -1967,9 +1962,6 @@ private boolean investigateClaim(InteractEvent event, Player player, BlockSnapsh
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) {
this.worldEditProvider.displayClaimCUIVisual(claim, player, playerData, true);
}
Set<Claim> claims = new HashSet<>();
claims.add(claim);
playerData.showNoClaimsFoundMessage = false;

4
sponge/src/main/java/com/griefdefender/task/ClaimVisualApplyTask.java
View File

@ -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()));
}

4
sponge/src/main/java/com/griefdefender/util/EconomyUtil.java
View File

@ -160,10 +160,6 @@ private static Consumer<CommandSource> 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);

12
sponge/src/main/resources/1.12.2.json
View File

@ -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",