From 345fc2256f6448b5f0ff3cae66e9b1cd930b7a81 Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Wed, 9 Jun 2021 12:57:18 +0200 Subject: [PATCH] fix death owner not picking up item --- Changelog.txt | 13 +++++++++++++ gradle.properties | 2 +- .../flemmli97/flan/event/EntityInteractEvents.java | 2 +- .../flan/gui/PersonalGroupScreenHandler.java | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 5bee40f..6b3f149 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,16 @@ +Flan 1.4.1 +====================== +- Change globalDefaultPerms to use a version where you can specify if its modifiable or not + Valid values are: + ALLTRUE: Permission is true everywhere and players are unable to change it in claims + ALLFALSE: Permission is false everywhere and players are unable to change it in claims + TRUE: Permission is true in non claimed areas + FALSE: Permission is false in non claimed areas + Old configs will get auto converted: false -> ALLFALSE and true -> ALLTRUE + Basically now a worldguard version +- Add locking items when the player dies so other players cant pick it up. + Use /flan unlockItems to allow it. + Flan 1.4.0 ====================== - Add FLIGHT permission. Prevents non creative flight in claims diff --git a/gradle.properties b/gradle.properties index e6c6f54..5733373 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx2G loader_version=0.9.1+build.205 # Mod Properties - mod_version = 1.4.0 + mod_version = 1.4.1 maven_group = com.flemmli97.flan archives_base_name = flan diff --git a/src/main/java/io/github/flemmli97/flan/event/EntityInteractEvents.java b/src/main/java/io/github/flemmli97/flan/event/EntityInteractEvents.java index 97d5cee..b677667 100644 --- a/src/main/java/io/github/flemmli97/flan/event/EntityInteractEvents.java +++ b/src/main/java/io/github/flemmli97/flan/event/EntityInteractEvents.java @@ -220,7 +220,7 @@ public class EntityInteractEvents { ServerPlayerEntity other = sPlayer.getServer().getPlayerManager().getPlayer(ownedItem.getDeathPlayer()); if (other == null) return false; - return PlayerClaimData.get(other).deathItemsUnlocked(); + return ownedItem.getDeathPlayer().equals(player.getUuid()) || PlayerClaimData.get(other).deathItemsUnlocked(); } if (sPlayer.getUuid().equals(ownedItem.getPlayerOrigin())) return true; diff --git a/src/main/java/io/github/flemmli97/flan/gui/PersonalGroupScreenHandler.java b/src/main/java/io/github/flemmli97/flan/gui/PersonalGroupScreenHandler.java index 6459c9b..31eb4a9 100644 --- a/src/main/java/io/github/flemmli97/flan/gui/PersonalGroupScreenHandler.java +++ b/src/main/java/io/github/flemmli97/flan/gui/PersonalGroupScreenHandler.java @@ -63,7 +63,7 @@ public class PersonalGroupScreenHandler extends ServerOnlyScreenHandler { } else if (i < 9 || i > 44 || i % 9 == 0 || i % 9 == 8) inv.setStack(i, ServerScreenHelper.emptyFiller()); else { - List groups = new ArrayList<>(PlayerClaimData.get(player).playerDefaultGroups().keySet()); + List groups = new ArrayList<>(PlayerClaimData.get((ServerPlayerEntity) player).playerDefaultGroups().keySet()); groups.sort(null); int row = i / 9 - 1; int id = (i % 9) + row * 7 - 1;