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

Handle flight, invulnerability and collidability on save / reset; resolves #535

Browse Source
This commit is contained in:
Daniel Saukel 2019-02-17 16:47:39 +01:00
parent 4922803bd9
commit 5c158c66e4
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,6 +363,12 @@ public class DGlobalPlayer implements PlayerWrapper {
player.addPotionEffects(data.getOldPotionEffects());
if (is1_9) {
player.setCollidable(data.getOldCollidabilityState());
player.setInvulnerable(data.getOldInvulnerabilityState());
}
player.setAllowFlight(data.getOldFlyingState());
} else {
for (ItemStack item : player.getInventory().getContents()) {
if (item == null) {

5
src/main/java/de/erethon/dungeonsxl/player/DInstancePlayer.java
View File

@ -81,6 +81,11 @@ public abstract class DInstancePlayer extends DGlobalPlayer {
for (PotionEffect effect : player.getActivePotionEffects()) {
player.removePotionEffect(effect.getType());
}
if (is1_9) {
player.setCollidable(true);
player.setInvulnerable(false);
}
player.setAllowFlight(false);
}
/**

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

@ -66,6 +66,9 @@ public class DPlayerData extends DREConfig {
private int oldFireTicks;
private GameMode oldGameMode;
private Collection<PotionEffect> oldPotionEffects;
private boolean oldCollidabilityState;
private boolean oldFlyingState;
private boolean oldInvulnerabilityState;
// Stats
private Map<String, Long> timeLastStarted = new HashMap<>();
@ -277,6 +280,48 @@ public class DPlayerData extends DREConfig {
oldPotionEffects = potionEffects;
}
/**
* @return if the player was collidable
*/
public boolean getOldCollidabilityState() {
return oldCollidabilityState;
}
/**
* @param collidableState the collidable state to set
*/
public void setOldCollidabilityState(boolean collidableState) {
oldCollidabilityState = collidableState;
}
/**
* @return if the player was flying
*/
public boolean getOldFlyingState() {
return oldFlyingState;
}
/**
* @param flyingState the flying state to set
*/
public void setOldFlyingState(boolean flyingState) {
oldFlyingState = flyingState;
}
/**
* @return if the player was invulnerable
*/
public boolean getOldInvulnerabilityState() {
return oldInvulnerabilityState;
}
/**
* @param invulnerabilityState the invulnerability state to set
*/
public void setOldInvulnerabilityState(boolean invulnerabilityState) {
oldFlyingState = invulnerabilityState;
}
/**
* @return a map of the player's started dungeons with dates.
*/
@ -476,6 +521,10 @@ public class DPlayerData extends DREConfig {
} catch (IllegalArgumentException exception) {
oldLocation = Bukkit.getWorlds().get(0).getSpawnLocation();
}
oldCollidabilityState = config.getBoolean(PREFIX_STATE_PERSISTENCE + "oldCollidabilityState", true);
oldFlyingState = config.getBoolean(PREFIX_STATE_PERSISTENCE + "oldFlyingState", false);
oldInvulnerabilityState = config.getBoolean(PREFIX_STATE_PERSISTENCE + "oldInvulnerabilityState", false);
}
@Override
@ -509,6 +558,11 @@ public class DPlayerData extends DREConfig {
}
oldLocation = player.getLocation();
oldPotionEffects = player.getActivePotionEffects();
if (is1_9) {
oldCollidabilityState = player.isCollidable();
oldInvulnerabilityState = player.isInvulnerable();
}
oldFlyingState = player.getAllowFlight();
config.set(PREFIX_STATE_PERSISTENCE + "oldGameMode", oldGameMode.toString());
config.set(PREFIX_STATE_PERSISTENCE + "oldFireTicks", oldFireTicks);
@ -522,6 +576,9 @@ public class DPlayerData extends DREConfig {
config.set(PREFIX_STATE_PERSISTENCE + "oldOffHand", oldOffHand);
config.set(PREFIX_STATE_PERSISTENCE + "oldLocation", oldLocation);
config.set(PREFIX_STATE_PERSISTENCE + "oldPotionEffects", oldPotionEffects);
config.set(PREFIX_STATE_PERSISTENCE + "oldCollidabilityState", oldCollidabilityState);
config.set(PREFIX_STATE_PERSISTENCE + "oldFlyingState", oldFlyingState);
config.set(PREFIX_STATE_PERSISTENCE + "oldInvulnerabilityState", oldInvulnerabilityState);
save();
}
@ -542,6 +599,9 @@ public class DPlayerData extends DREConfig {
oldOffHand = null;
oldLocation = null;
oldPotionEffects = null;
oldCollidabilityState = true;
oldFlyingState = false;
oldInvulnerabilityState = false;
if (wasInGame()) {
config.set("savePlayer", null);