Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 13:36:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix gamemode not being reset if !keepInventory; resolves #491

Browse Source
This commit is contained in:
Daniel Saukel 2019-01-03 16:59:26 +01:00
parent bc459caac1
commit 808f5a03aa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/erethon/dungeonsxl/player/DGlobalPlayer.java
View File

@ -337,6 +337,7 @@ public class DGlobalPlayer implements PlayerWrapper {
private void reset(Location tpLoc, boolean keepInventory) {
try {
PlayerUtil.secureTeleport(player, tpLoc);
player.setGameMode(data.getOldGameMode());
if (!keepInventory) {
while (data.getOldInventory().size() > 36) {
data.getOldInventory().remove(36);
@ -355,7 +356,6 @@ public class DGlobalPlayer implements PlayerWrapper {
player.setHealth(player.getMaxHealth());
}
player.setFoodLevel(data.getOldFoodLevel());
player.setGameMode(data.getOldGameMode());
player.setFireTicks(data.getOldFireTicks());
for (PotionEffect effect : player.getActivePotionEffects()) {
player.removePotionEffect(effect.getType());