Update StarCosmetics.java

gmitch215 · Dec 23, 2023 · d4aa6e7 · d4aa6e7
1 parent fb85495
commit d4aa6e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/...src/main/java/me/gamercoder215/starcosmetics/wrapper/cosmetics/CosmeticSelections1_9.java b/...src/main/java/me/gamercoder215/starcosmetics/wrapper/cosmetics/CosmeticSelections1_9.java
@@ -549,12 +549,6 @@ final class CosmeticSelections1_9 implements CosmeticSelections {
 
                 loc.getWorld().playSound(loc, Sound.ENTITY_SNOWBALL_THROW, 2F, r.nextFloat(0.3F, 0.6F));
             }, fromMined(30, Material.SNOW_BLOCK), COMMON))
-            .add(new GadgetSelection("egg", Material.EGG, loc -> {
-                Egg e = cosmetic(loc.getWorld().spawn(loc, Egg.class));
-                e.setVelocity(loc.getDirection().multiply(1.5));
-
-                loc.getWorld().playSound(loc, Sound.ENTITY_EGG_THROW, 2F, r.nextFloat(0.3F, 0.6F));
-            }, fromKilled(50, EntityType.CHICKEN), COMMON))
 
             .add(new GadgetSelection("tnt_launcher", Material.TNT, loc -> {
                 TNTPrimed tnt = cosmetic(loc.getWorld().spawn(loc, TNTPrimed.class));

diff --git a/plugin/src/main/java/me/gamercoder215/starcosmetics/StarCosmetics.java b/plugin/src/main/java/me/gamercoder215/starcosmetics/StarCosmetics.java
@@ -200,10 +200,10 @@ private void postChecks() {
 
     @Override
     public void onDisable() {
-        // Remove Cosmetic Fireworks
+        // Remove Cosmetic Entities
         for (World w : Bukkit.getWorlds())
-            for (Firework f : w.getEntitiesByClass(Firework.class))
-                if (f.hasMetadata("cosmetic")) f.remove();
+            for (Entity en : w.getEntities())
+                if (en.hasMetadata("cosmetic")) en.remove();
 
         try {
             ASYNC_TICK_RUNNABLE.cancel();