Skip to content

Commit 5d3b582

Browse files
Update GriefPrevention ABI, remove deprecated usages
1 parent 069930d commit 5d3b582

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

src/main/java/org/maxgamer/quickshop/integration/griefprevention/GriefPreventionIntegration.java

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@
2222
import me.ryanhamshire.GriefPrevention.Claim;
2323
import me.ryanhamshire.GriefPrevention.ClaimPermission;
2424
import me.ryanhamshire.GriefPrevention.GriefPrevention;
25-
import me.ryanhamshire.GriefPrevention.events.*;
25+
import me.ryanhamshire.GriefPrevention.events.ClaimChangeEvent;
26+
import me.ryanhamshire.GriefPrevention.events.ClaimCreatedEvent;
27+
import me.ryanhamshire.GriefPrevention.events.ClaimDeletedEvent;
28+
import me.ryanhamshire.GriefPrevention.events.ClaimExpirationEvent;
29+
import me.ryanhamshire.GriefPrevention.events.TrustChangedEvent;
2630
import org.bukkit.Chunk;
2731
import org.bukkit.Location;
28-
import org.bukkit.Material;
2932
import org.bukkit.configuration.ConfigurationSection;
3033
import org.bukkit.configuration.MemoryConfiguration;
3134
import org.bukkit.entity.Player;
@@ -155,7 +158,7 @@ public void onClaimExpired(ClaimExpirationEvent event) {
155158
// Player can resize the main claim or the subclaim.
156159
// So we need to call either the handleMainClaimResized or the handleSubClaimResized method.
157160
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
158-
public void onClaimResized(ClaimModifiedEvent event) {
161+
public void onClaimResized(ClaimChangeEvent event) {
159162
if (!deleteOnClaimResized) {
160163
return;
161164
}
@@ -336,31 +339,16 @@ public ReloadResult reloadModule() {
336339
enum Flag {
337340

338341
BUILD {
339-
@Override
340-
boolean check(Claim claim, Player player) {
341-
return claim.allowBuild(player, Material.CHEST) == null;
342-
}
343-
344342
@Override
345343
ClaimPermission toClaimPermission() {
346344
return ClaimPermission.Build;
347345
}
348346
}, INVENTORY {
349-
@Override
350-
boolean check(Claim claim, Player player) {
351-
return claim.allowContainers(player) == null;
352-
}
353-
354347
@Override
355348
ClaimPermission toClaimPermission() {
356349
return ClaimPermission.Inventory;
357350
}
358351
}, ACCESS {
359-
@Override
360-
boolean check(Claim claim, Player player) {
361-
return claim.allowAccess(player) == null;
362-
}
363-
364352
@Override
365353
ClaimPermission toClaimPermission() {
366354
return ClaimPermission.Access;
@@ -376,7 +364,9 @@ public static Flag getFlag(String flag) {
376364
return null;
377365
}
378366

379-
abstract boolean check(Claim claim, Player player);
367+
boolean check(Claim claim, Player player) {
368+
return claim.checkPermission(player, toClaimPermission(), null) == null;
369+
}
380370

381371
abstract ClaimPermission toClaimPermission();
382372
}

0 commit comments

Comments
 (0)