Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-26 15:45:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Soulbound bug

Browse Source 
There are some cases where the player's inventory is not empty right after respawning. For example, ItemsAdder gives a death map right after the player respawns. In this case, EcoEnchants won't give back soulbound items to the player, causing the items just disappeared.

I fix this by checking if there is any soulbound items right after respawning, instead of simply checking whether the player's inventory is empty or not.

More robust logic to handle such case is expected. My solution is just a workaround.
This commit is contained in:
Akiranya 2021-09-09 17:05:49 +08:00
parent a9c345317c
commit b9cd266d0e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java
View File

@ -5,7 +5,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
import org.bukkit.Material; import org.bukkit.NamespacedKey;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -97,9 +97,10 @@ public class Soulbound extends EcoEnchant {
player.setMetadata("soulbound-items", this.getPlugin().getMetadataValueFactory().create(soulboundItems)); player.setMetadata("soulbound-items", this.getPlugin().getMetadataValueFactory().create(soulboundItems));
} }
public boolean hasEmptyInventory(@NotNull final Player player) { public boolean hasSoulboundItems(@NotNull final Player player) {
final NamespacedKey soulbound = this.getPlugin().getNamespacedKeyFactory().create("soulbound");
for (ItemStack itemStack : player.getInventory().getContents()) { for (ItemStack itemStack : player.getInventory().getContents()) {
if (itemStack != null && itemStack.getType() != Material.AIR) { if (itemStack != null && itemStack.getItemMeta().getPersistentDataContainer().has(soulbound, PersistentDataType.INTEGER)) {
return false; return false;
} }
} }
@ -111,7 +112,7 @@ public class Soulbound extends EcoEnchant {
Player player = event.getPlayer(); Player player = event.getPlayer();
this.getPlugin().getScheduler().runLater(() -> { this.getPlugin().getScheduler().runLater(() -> {
if (!hasEmptyInventory(player)) { if (!hasSoulboundItems(player)) {
return; return;
} }
@ -142,6 +143,7 @@ public class Soulbound extends EcoEnchant {
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onDeath(@NotNull final PlayerDeathEvent event) { public void onDeath(@NotNull final PlayerDeathEvent event) {
event.getDrops().removeIf(itemStack -> itemStack.getItemMeta().getPersistentDataContainer().has(this.getPlugin().getNamespacedKeyFactory().create("soulbound"), PersistentDataType.INTEGER)); final NamespacedKey soulbound = this.getPlugin().getNamespacedKeyFactory().create("soulbound");
event.getDrops().removeIf(itemStack -> itemStack.getItemMeta().getPersistentDataContainer().has(soulbound, PersistentDataType.INTEGER));
} }
} }