fireworks don't spam on respawn #405

Caltinor · Nov 5, 2023 · 0675be2 · 0675be2
1 parent 8a312e8
commit 0675be2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/harmonised/pmmo/events/EventHandler.java b/src/main/java/harmonised/pmmo/events/EventHandler.java
@@ -1,5 +1,6 @@
 package harmonised.pmmo.events;
 
+import harmonised.pmmo.api.APIUtils;
 import harmonised.pmmo.api.enums.EventType;
 import harmonised.pmmo.api.events.EnchantEvent;
 import harmonised.pmmo.api.events.FurnaceBurnEvent;
@@ -8,6 +9,7 @@
 import harmonised.pmmo.events.impl.*;
 import harmonised.pmmo.features.party.PartyUtils;
 import harmonised.pmmo.util.Reference;
+import harmonised.pmmo.util.TagBuilder;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
@@ -76,7 +78,8 @@ public static void onGamemodeChange(PlayerChangeGameModeEvent event) {
 	@SubscribeEvent
 	public static void onRespawn(PlayerRespawnEvent event) {
 		Core core = Core.get(event.getEntity().level()); 
-		core.getPerkRegistry().executePerk(EventType.SKILL_UP, event.getEntity(), new CompoundTag());
+		core.getPerkRegistry().executePerk(EventType.SKILL_UP, event.getEntity(),
+				TagBuilder.start().withString(APIUtils.SKILLNAME, "respawn").build());
 	}
 	@SubscribeEvent(priority=EventPriority.LOWEST)
 	public static void onSleep(SleepFinishedTimeEvent event) {

diff --git a/src/main/java/harmonised/pmmo/features/fireworks/FireworkHandler.java b/src/main/java/harmonised/pmmo/features/fireworks/FireworkHandler.java
@@ -21,7 +21,7 @@ public class FireworkHandler {
 	public static final String FIREWORK_SKILL = "firework_skill";
 
 	public static final Perk FIREWORK = Perk.begin()
-			.addDefaults(TagBuilder.start().withString(APIUtils.SKILLNAME, "none").build())
+			.addDefaults(TagBuilder.start().withString(FIREWORK_SKILL, "none").build())
 			.setStart((player, nbt) -> {
 				BlockPos pos = player.blockPosition();
 				spawnRocket(player.level(), new Vec3(pos.getX(), pos.getY(), pos.getZ()), nbt.getString(FIREWORK_SKILL));