From 7c8cbd41a4489abe69a0540c47cde3cfd2b08927 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 7 May 2022 10:08:59 -0400
Subject: [PATCH] Added DrawPart to ClassMap

---
 core/src/mindustry/core/NetServer.java             | 1 +
 core/src/mindustry/mod/ClassMap.java               | 9 +++++++++
 core/src/mindustry/mod/Mods.java                   | 2 +-
 tools/src/mindustry/tools/ScriptMainGenerator.java | 3 ++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index bc819b169e..fb948cd304 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -220,6 +220,7 @@ public class NetServer implements ApplicationListener{
                 }
 
                 if(Groups.player.contains(player -> player.uuid().equals(packet.uuid) || player.usid().equals(packet.usid))){
+                    con.uuid = packet.uuid;
                     con.kick(KickReason.idInUse);
                     return;
                 }
diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java
index 1b572ccd77..de91563081 100644
--- a/core/src/mindustry/mod/ClassMap.java
+++ b/core/src/mindustry/mod/ClassMap.java
@@ -65,6 +65,15 @@ public class ClassMap{
         classes.put("SeqEffect", mindustry.entities.effect.SeqEffect.class);
         classes.put("WaveEffect", mindustry.entities.effect.WaveEffect.class);
         classes.put("WrapEffect", mindustry.entities.effect.WrapEffect.class);
+        classes.put("DrawPart", mindustry.entities.part.DrawPart.class);
+        classes.put("PartFunc", mindustry.entities.part.DrawPart.PartFunc.class);
+        classes.put("PartMove", mindustry.entities.part.DrawPart.PartMove.class);
+        classes.put("PartParams", mindustry.entities.part.DrawPart.PartParams.class);
+        classes.put("PartProgress", mindustry.entities.part.DrawPart.PartProgress.class);
+        classes.put("FlarePart", mindustry.entities.part.FlarePart.class);
+        classes.put("HoverPart", mindustry.entities.part.HoverPart.class);
+        classes.put("RegionPart", mindustry.entities.part.RegionPart.class);
+        classes.put("ShapePart", mindustry.entities.part.ShapePart.class);
         classes.put("ShootAlternate", mindustry.entities.pattern.ShootAlternate.class);
         classes.put("ShootBarrel", mindustry.entities.pattern.ShootBarrel.class);
         classes.put("ShootHelix", mindustry.entities.pattern.ShootHelix.class);
diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index 5de3785019..f450840504 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -793,7 +793,7 @@ public class Mods implements Loadable{
                 }
 
                 meta = findMeta(zip);
-            }catch(Exception ignored){
+            }catch(Throwable ignored){
             }
 
             if(meta == null) continue;
diff --git a/tools/src/mindustry/tools/ScriptMainGenerator.java b/tools/src/mindustry/tools/ScriptMainGenerator.java
index 5f489d4e4a..f112e88cf7 100644
--- a/tools/src/mindustry/tools/ScriptMainGenerator.java
+++ b/tools/src/mindustry/tools/ScriptMainGenerator.java
@@ -85,7 +85,8 @@ public class ScriptMainGenerator{
         "mindustry.world.blocks",
         "mindustry.world.draw",
         "mindustry.type",
-        "mindustry.entities.pattern"
+        "mindustry.entities.pattern",
+        "mindustry.entities.part"
         );
 
         String classTemplate = "package mindustry.mod;\n" +