🛠 Fix keep inv/exp and other bugs related to death event (SkriptLang#…

…5658)

src/main/java/ch/njol/skript/effects/EffKeepInventory.java

@@ -19,6 +19,7 @@
 package ch.njol.skript.effects;
 
 import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -35,17 +36,19 @@
 
 @Name("Keep Inventory / Experience")
 @Description("Keeps the inventory or/and experiences of the dead player in a death event.")
-@Examples({"on death of a player:",
+@Examples({
+	"on death of a player:",
 		"\tif the victim is an op:",
-		"\t\tkeep the inventory and experiences"})
+			"\t\tkeep the inventory and experiences"
+})
 @Since("2.4")
 @Events("death")
 public class EffKeepInventory extends Effect {
 
 	static {
 		Skript.registerEffect(EffKeepInventory.class,
-			"keep [the] (inventory|items) [(1¦and [e]xp[erience][s] [point[s]])]",
-			"keep [the] [e]xp[erience][s] [point[s]] [(1¦and (inventory|items))]");
+			"keep [the] (inventory|items) [(1:and [e]xp[erience][s] [point[s]])]",
+			"keep [the] [e]xp[erience][s] [point[s]] [(1:and (inventory|items))]");
 	}
 
 	private boolean keepItems, keepExp;
@@ -54,7 +57,7 @@ public class EffKeepInventory extends Effect {
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		keepItems = matchedPattern == 0 || parseResult.mark == 1;
 		keepExp = matchedPattern == 1 || parseResult.mark == 1;
-		if (!getParser().isCurrentEvent(PlayerDeathEvent.class)) {
+		if (!getParser().isCurrentEvent(EntityDeathEvent.class)) {
 			Skript.error("The keep inventory/experience effect can't be used outside of a death event");
 			return false;
 		}
@@ -66,18 +69,18 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	}
 
 	@Override
-	protected void execute(Event e) {
-		if (e instanceof PlayerDeathEvent) {
-			PlayerDeathEvent event = (PlayerDeathEvent) e;
+	protected void execute(Event event) {
+		if (event instanceof PlayerDeathEvent) {
+			PlayerDeathEvent deathEvent = (PlayerDeathEvent) event;
 			if (keepItems)
-				event.setKeepInventory(true);
+				deathEvent.setKeepInventory(true);
 			if (keepExp)
-				event.setKeepLevel(true);
+				deathEvent.setKeepLevel(true);
 		}
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
+	public String toString(@Nullable Event event, boolean debug) {
 		if (keepItems && !keepExp)
 			return "keep the inventory";
 		else

src/main/java/ch/njol/skript/effects/EffRespawn.java

@@ -20,7 +20,7 @@
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.eclipse.jdt.annotation.Nullable;
@@ -62,7 +62,7 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 		players = (Expression<Player>) exprs[0];
 		// Force a delay before respawning the player if we're in the death event and there isn't already a delay
 		// Unexpected behavior may occur if we don't do this
-		forceDelay = getParser().isCurrentEvent(PlayerDeathEvent.class) && isDelayed.isFalse();
+		forceDelay = getParser().isCurrentEvent(EntityDeathEvent.class) && isDelayed.isFalse();
 		return true;
 	}
 

src/main/java/ch/njol/skript/expressions/ExprLevel.java

@@ -20,6 +20,7 @@
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerLevelChangeEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
@@ -80,11 +81,11 @@ public Class<?>[] acceptChange(final ChangeMode mode) {
 			Skript.error("Cannot change a player's level in a respawn event. Add a delay of 1 tick or change the 'new level' in a death event.");
 			return null;
 		}
-		if (getParser().isCurrentEvent(PlayerDeathEvent.class) && getTime() == 0 && getExpr().isDefault() && !getParser().getHasDelayBefore().isTrue()) {
+		if (getParser().isCurrentEvent(EntityDeathEvent.class) && getTime() == 0 && getExpr().isDefault() && !getParser().getHasDelayBefore().isTrue()) {
 			Skript.warning("Changing the player's level in a death event will change the player's level before he dies. " +
 					"Use either 'past level of player' or 'new level of player' to clearly state whether to change the level before or after he dies.");
 		}
-		if (getTime() == -1 && !getParser().isCurrentEvent(PlayerDeathEvent.class))
+		if (getTime() == -1 && !getParser().isCurrentEvent(EntityDeathEvent.class))
 			return null;
 		return new Class[] {Number.class};
 	}