cleanup

Ladysnake · Oct 18, 2024 · 1dd348e · 1dd348e
1 parent 4e8a161
commit 1dd348e
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/ladysnake/blast/common/entity/BombEntity.java b/src/main/java/ladysnake/blast/common/entity/BombEntity.java
@@ -79,6 +79,13 @@ protected Item getDefaultItem() {
         return BlastItems.BOMB;
     }
 
+    @Override
+    public void setItem(ItemStack item) {
+        super.setItem(item.getItem().getDefaultStack());
+        setFuse(item.getOrDefault(BlastComponentTypes.FUSE, getFuse()));
+        setExplosionRadius(item.getOrDefault(BlastComponentTypes.EXPLOSION_RADIUS, getExplosionRadius()));
+    }
+
     @Override
     protected void onCollision(HitResult hitResult) {
         if (age > 1) {
@@ -120,8 +127,8 @@ public void explode() {
             CustomExplosion explosion = getExplosion();
             explosion.collectBlocksAndDamageEntities();
             explosion.affectWorld(true);
-            if (!getWorld().isClient()) {
-                for (ServerPlayerEntity player : PlayerLookup.world((ServerWorld) getWorld())) {
+            if (getWorld() instanceof ServerWorld serverWorld) {
+                for (ServerPlayerEntity player : PlayerLookup.world(serverWorld)) {
                     if (player.squaredDistanceTo(getX(), getY(), getZ()) < 4096) {
                         player.networkHandler.sendPacket(new ExplosionS2CPacket(getX(), getY(), getZ(), explosion.getPower(), explosion.getAffectedBlocks(), explosion.getAffectedPlayers().get(player), explosion.getDestructionType(), explosion.getParticle(), explosion.getEmitterParticle(), explosion.getSoundEvent()));
                     }
@@ -163,13 +170,6 @@ public void setExplosionRadius(float explosionRadius) {
         this.explosionRadius = explosionRadius;
     }
 
-    @Override
-    public void setItem(ItemStack item) {
-        super.setItem(item.getItem().getDefaultStack());
-        setFuse(item.getOrDefault(BlastComponentTypes.FUSE, getFuse()));
-        setExplosionRadius(item.getOrDefault(BlastComponentTypes.EXPLOSION_RADIUS, getExplosionRadius()));
-    }
-
     public enum BombTriggerType {
         FUSE,
         IMPACT