Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-19 13:51:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix keepInventoryOnEnter: true with Finish/Escape: false

Browse Source
This commit is contained in:
Daniel Saukel 2021-10-17 00:59:26 +02:00
parent 2c7ae708ec
commit b61e1267d0
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java
View File

@ -27,7 +27,6 @@ import de.erethon.dungeonsxl.util.commons.misc.EnumUtil;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -41,6 +40,7 @@ import org.bukkit.attribute.AttributeInstance;
import org.bukkit.attribute.AttributeModifier; import org.bukkit.attribute.AttributeModifier;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
/** /**
@ -595,10 +595,19 @@ public class DPlayerData extends DREConfig {
oldHealth = player.getHealth(); oldHealth = player.getHealth();
oldExp = player.getExp(); oldExp = player.getExp();
oldLvl = player.getLevel(); oldLvl = player.getLevel();
oldArmor = new ArrayList<>(Arrays.asList(player.getInventory().getArmorContents())); PlayerInventory inv = player.getInventory();
oldInventory = new ArrayList<>(Arrays.asList(player.getInventory().getContents())); oldArmor = new ArrayList<>(4);
for (int i = 0; i < 4; i++) {
ItemStack itemStack = inv.getArmorContents()[i];
oldArmor.add(itemStack != null ? itemStack.clone() : null);
}
oldInventory = new ArrayList<>(36);
for (int i = 0; i < 36; i++) {
ItemStack itemStack = inv.getContents()[i];
oldInventory.add(itemStack != null ? itemStack.clone() : null);
}
if (is1_9) { if (is1_9) {
oldOffHand = player.getInventory().getItemInOffHand(); oldOffHand = inv.getItemInOffHand().clone();
} }
oldLocation = player.getLocation(); oldLocation = player.getLocation();
oldPotionEffects = player.getActivePotionEffects(); oldPotionEffects = player.getActivePotionEffects();