Fix: clear items with Curse of Vanishing from immediate_respawn behavior

LoveTropics · Nov 11, 2024 · 4a8fb43 · 4a8fb43
1 parent c0bc6c6
commit 4a8fb43
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...ics/minigames/common/content/survive_the_tide/behavior/SurviveTheTideRulesetBehavior.java b/...ics/minigames/common/content/survive_the_tide/behavior/SurviveTheTideRulesetBehavior.java
@@ -6,6 +6,7 @@
 import com.lovetropics.minigames.common.core.game.behavior.event.EventRegistrar;
 import com.lovetropics.minigames.common.core.game.behavior.event.GameLivingEntityEvents;
 import com.lovetropics.minigames.common.core.game.behavior.event.GamePlayerEvents;
+import com.lovetropics.minigames.common.core.game.behavior.instances.ImmediateRespawnBehavior;
 import com.lovetropics.minigames.common.core.game.state.GameProgressionState;
 import com.lovetropics.minigames.common.core.game.state.ProgressionPeriod;
 import com.mojang.serialization.Codec;
@@ -53,7 +54,7 @@ public void register(IGamePhase game, EventRegistrar events) throws GameExceptio
 
 	private InteractionResult onPlayerDeath(ServerPlayer player, DamageSource damageSource) {
 		if (forceDropItemsOnDeath && player.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY)) {
-			destroyVanishingCursedItems(player.getInventory());
+			ImmediateRespawnBehavior.destroyVanishingCursedItems(player.getInventory());
 			player.getInventory().dropAll();
 		}
 		return InteractionResult.PASS;
@@ -73,12 +74,5 @@ private InteractionResult onPlayerAttackEntity(ServerPlayer player, Entity targe
 		return InteractionResult.PASS;
 	}
 
-	private void destroyVanishingCursedItems(Container inventory) {
-		for (int i = 0; i < inventory.getContainerSize(); ++i) {
-			ItemStack itemstack = inventory.getItem(i);
-			if (!itemstack.isEmpty() && EnchantmentHelper.has(itemstack, EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP)) {
-				inventory.removeItemNoUpdate(i);
-			}
-		}
-	}
+
 }
diff --git a/...m/lovetropics/minigames/common/core/game/behavior/instances/ImmediateRespawnBehavior.java b/...m/lovetropics/minigames/common/core/game/behavior/instances/ImmediateRespawnBehavior.java
@@ -15,8 +15,11 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.item.enchantment.EnchantmentEffectComponents;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
 
 import javax.annotation.Nullable;
 import java.util.Map;
@@ -39,6 +42,7 @@ public void register(IGamePhase game, EventRegistrar events) {
 	}
 
 	private InteractionResult onPlayerDeath(IGamePhase game, ServerPlayer player, DamageSource source) {
+		destroyVanishingCursedItems(player.getInventory());
 		if (dropInventory) {
 			player.getInventory().dropAll();
 		}
@@ -80,4 +84,12 @@ private void sendDeathMessage(IGamePhase game, ServerPlayer player) {
 			game.allPlayers().sendMessage(message);
 		}
 	}
+
+	public static void destroyVanishingCursedItems(Container inventory) {
+		for (int i = 0; i < inventory.getContainerSize(); ++i) {
+			if (EnchantmentHelper.has(inventory.getItem(i), EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP)) {
+				inventory.removeItemNoUpdate(i);
+			}
+		}
+	}
 }