misc: 排除 CREAKING_TRANSIENT

NiFeather · Nov 29, 2024 · e8d72f7 · e8d72f7
1 parent 3726f2b
commit e8d72f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/xyz/nifeather/morph/events/CommonEventProcessor.java b/src/main/java/xyz/nifeather/morph/events/CommonEventProcessor.java
@@ -618,6 +618,12 @@ private void onPlayerKillEntity(Player player, Entity entity)
         if (entity instanceof Player targetPlayer)
             morphs.grantMorphToPlayer(player, DisguiseTypes.PLAYER.toId(targetPlayer.getName()));
         else
-            morphs.grantMorphToPlayer(player, entity.getType().getKey().asString());
+        {
+            var type = entity.getType();
+            if (type == EntityType.CREAKING_TRANSIENT)
+                type = EntityType.CREAKING;
+
+            morphs.grantMorphToPlayer(player, type.getKey().asString());
+        }
     }
 }
diff --git a/src/main/java/xyz/nifeather/morph/providers/disguise/VanillaDisguiseProvider.java b/src/main/java/xyz/nifeather/morph/providers/disguise/VanillaDisguiseProvider.java
@@ -77,7 +77,7 @@ public VanillaDisguiseProvider()
 
         for (var eT : EntityType.values())
         {
-            if (eT == EntityType.UNKNOWN || !eT.isAlive()) continue;
+            if (eT == EntityType.UNKNOWN || eT == EntityType.CREAKING_TRANSIENT || !eT.isAlive()) continue;
 
             list.add(eT.getKey().getKey());
         }