Fix SyncExplosionPacket desync.

MerchantPug · May 18, 2024 · deb16cb · deb16cb
1 parent e80321c
commit deb16cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 26 deletions.
diff --git a/Common/src/main/java/net/merchantpug/apugli/action/factory/entity/ExplodeAction.java b/Common/src/main/java/net/merchantpug/apugli/action/factory/entity/ExplodeAction.java
@@ -126,9 +126,7 @@ protected void summonExplosion(SerializableData.Instance data, Entity entity, fl
                     true,
                     data.get(blockConditionFieldKey),
                     indestructible,
-                    createFire,
-                    power,
-                    data.get("destruction_type")
+                    power
                     ), entity);
         } else {
             Explosion explosion = new Explosion(entity.level(), entity,
@@ -154,9 +152,7 @@ protected void summonExplosion(SerializableData.Instance data, Entity entity, fl
                     false,
                     null,
                     false,
-                    createFire,
-                    power,
-                    data.get("destruction_type")
+                    power
             ), entity);
         }
     }

diff --git a/...on/src/main/java/net/merchantpug/apugli/action/factory/entity/ExplosionRaycastAction.java b/...on/src/main/java/net/merchantpug/apugli/action/factory/entity/ExplosionRaycastAction.java
@@ -169,9 +169,7 @@ protected void summonExplosion(SerializableData.Instance data, Entity entity, Hi
                     true,
                     data.get(blockConditionFieldKey),
                     indestructible,
-                    createFire,
-                    power,
-                    data.get("destruction_type")), entity);
+                    power), entity);
         } else {
             Explosion explosion = new Explosion(entity.level(), damageSelf ? null : entity,
                     null, null,
@@ -194,9 +192,7 @@ protected void summonExplosion(SerializableData.Instance data, Entity entity, Hi
                     false,
                     null,
                     false,
-                    createFire,
-                    power,
-                    data.get("destruction_type")), entity);
+                    power), entity);
         }
     }
 

diff --git a/Common/src/main/java/net/merchantpug/apugli/network/s2c/SyncExplosionPacket.java b/Common/src/main/java/net/merchantpug/apugli/network/s2c/SyncExplosionPacket.java
@@ -33,9 +33,7 @@ public record SyncExplosionPacket<BI, B>(int userId,
                                          boolean hasCalculator,
                                          @Nullable B blockConditions,
                                          boolean indestructible,
-                                         boolean causesFire,
-                                         float power,
-                                         Explosion.BlockInteraction interaction) implements ApugliPacketS2C {
+                                         float power) implements ApugliPacketS2C {
     public static final ResourceLocation ID = Apugli.asResource("sync_explosion");
 
     @Override
@@ -62,9 +60,7 @@ public void encode(FriendlyByteBuf buf) {
         }
 
         buf.writeBoolean(indestructible());
-        buf.writeBoolean(causesFire());
         buf.writeFloat(power());
-        SerializableDataTypes.DESTRUCTION_TYPE.send(buf, interaction());
     }
 
     public static <BI, B> SyncExplosionPacket<BI, B> decode(FriendlyByteBuf buf) {
@@ -89,12 +85,9 @@ public static <BI, B> SyncExplosionPacket<BI, B> decode(FriendlyByteBuf buf) {
             blockDataCondition = (B) Services.CONDITION.blockDataType().receive(buf);
         }
         boolean indestructible = buf.readBoolean();
-        boolean causesFire = buf.readBoolean();
         float radius = buf.readFloat();
 
-        Explosion.BlockInteraction interaction = SerializableDataTypes.DESTRUCTION_TYPE.receive(buf);
-
-        return new SyncExplosionPacket<>(userId, x, y, z, damageModifiers, knockbackModifiers, volumeModifiers, pitchModifiers, biEntityCondition, hasCalculator, blockDataCondition, indestructible, causesFire, radius, interaction);
+        return new SyncExplosionPacket<>(userId, x, y, z, damageModifiers, knockbackModifiers, volumeModifiers, pitchModifiers, biEntityCondition, hasCalculator, blockDataCondition, indestructible, radius);
     }
 
     @Override
@@ -110,13 +103,12 @@ public void run() {
                 Level level = Minecraft.getInstance().level;
                 Entity entity = level.getEntity(userId);
                 Explosion explosion = new Explosion(level, entity,
-                        null, createBlockConditionedExplosionDamageCalculator(blockConditions(), level, indestructible), x, y, z, power, causesFire, interaction);
+                        null, createBlockConditionedExplosionDamageCalculator(blockConditions(), level, indestructible), x, y, z, power, false, Explosion.BlockInteraction.KEEP);
                 ((ExplosionAccess) explosion).apugli$setExplosionDamageModifiers(damageModifiers());
                 ((ExplosionAccess) explosion).apugli$setExplosionKnockbackModifiers(knockbackModifiers());
                 ((ExplosionAccess) explosion).apugli$setExplosionVolumeModifiers(volumeModifiers());
                 ((ExplosionAccess) explosion).apugli$setExplosionPitchModifiers(pitchModifiers());
                 ((ExplosionAccess) explosion).apugli$setBiEntityPredicate(biEntityConditions());
-                explosion.explode();
                 explosion.finalizeExplosion(true);
             }
         });

diff --git a/Common/src/main/java/net/merchantpug/apugli/power/factory/RocketJumpPowerFactory.java b/Common/src/main/java/net/merchantpug/apugli/power/factory/RocketJumpPowerFactory.java
@@ -149,9 +149,7 @@ default void sendExplosionToClient(P power, SerializableData.Instance data, Livi
                 false,
                 null,
                 false,
-                false,
-                radius,
-                Explosion.BlockInteraction.KEEP);
+                radius);
         if (entity instanceof ServerPlayer serverPlayer)
             Services.PLATFORM.sendS2CTrackingAndSelf(packet, serverPlayer);
     }