I redid all the advancements and also started work on the second Offence2 ability

1 files changed, 15 insertions, 0 deletions

diff --git a/src/main/java/dev/mayaqq/ygasi/events/PlayerConnectEvent.java b/src/main/java/dev/mayaqq/ygasi/events/PlayerConnectEvent.java
index 97cd225..6723d01 100644
--- a/src/main/java/dev/mayaqq/ygasi/events/PlayerConnectEvent.java
+++ b/src/main/java/dev/mayaqq/ygasi/events/PlayerConnectEvent.java
@@ -2,8 +2,12 @@ package dev.mayaqq.ygasi.events;
 
 import dev.mayaqq.ygasi.registry.ConfigRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
+import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 
+import java.util.UUID;
+
+import static dev.mayaqq.ygasi.abilities.mercenary.Offence2.playerSwords;
 import static dev.mayaqq.ygasi.registry.ItemRegistry.SKILL_BOOK;
 
 public class PlayerConnectEvent {
@@ -16,4 +20,15 @@ public class PlayerConnectEvent {
             }
         });
     }
+    public static void onPlayerDisconnect() {
+        ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> {
+            if (playerSwords.get(handler.player.getUuidAsString()) != null) {
+                playerSwords.get(handler.player.getUuidAsString()).forEach(uuid -> {
+                    Entity sword = handler.player.getWorld().getEntity(UUID.fromString(uuid));
+                    sword.remove(Entity.RemovalReason.DISCARDED);
+                });
+                playerSwords.remove(handler.player.getUuidAsString());
+            }
+        });
+    }
 }
\ No newline at end of file