Merge pull request #317 from Smartin-b/1.20.1

ReplayMod Compat
ZsoltMolnarrr · Jan 21, 2024 · 62e8070 · 62e8070
2 parents 9090f08 + 855b328
commit 62e8070
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/common/src/main/java/net/bettercombat/client/ClientNetwork.java b/common/src/main/java/net/bettercombat/client/ClientNetwork.java
@@ -16,11 +16,13 @@ public static void initializeHandlers() {
             final var packet = Packets.AttackAnimation.read(buf);
             client.execute(() -> {
                 var entity = client.world.getEntityById(packet.playerId());
-                if (entity instanceof PlayerEntity) {
+                //This addition check is not required, ive tested without it,
+                //but it probably retriggers the animation and could lead to issues on servers with higher pings
+                if (entity instanceof PlayerEntity player && player != client.player) {
                     if (packet.animationName().equals(Packets.AttackAnimation.StopSymbol)) {
-                        ((PlayerAttackAnimatable)entity).stopAttackAnimation(packet.length());
+                        ((PlayerAttackAnimatable) entity).stopAttackAnimation(packet.length());
                     } else {
-                        ((PlayerAttackAnimatable)entity).playAttackAnimation(packet.animationName(), packet.animatedHand(), packet.length(), packet.upswing());
+                        ((PlayerAttackAnimatable) entity).playAttackAnimation(packet.animationName(), packet.animatedHand(), packet.length(), packet.upswing());
                     }
                 }
             });
@@ -36,7 +38,7 @@ public static void initializeHandlers() {
 
                     var soundEvent = Registries.SOUND_EVENT.get(new Identifier(packet.soundId()));
                     var configVolume = BetterCombatClient.config.weaponSwingSoundVolume;
-                    var volume = packet.volume() * ((float)Math.min(Math.max(configVolume, 0), 100) / 100F);
+                    var volume = packet.volume() * ((float) Math.min(Math.max(configVolume, 0), 100) / 100F);
                     client.world.playSound(
                             packet.x(),
                             packet.y(),

diff --git a/common/src/main/java/net/bettercombat/network/ServerNetwork.java b/common/src/main/java/net/bettercombat/network/ServerNetwork.java
@@ -27,6 +27,7 @@
 import net.minecraft.entity.attribute.EntityAttributeModifier;
 import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.entity.decoration.ArmorStandEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.PersistentProjectileEntity;
 import net.minecraft.item.SwordItem;
 import net.minecraft.network.PacketByteBuf;
@@ -37,6 +38,7 @@
 import net.minecraft.text.Text;
 import org.slf4j.Logger;
 
+import java.util.Collection;
 import java.util.UUID;
 
 public class ServerNetwork {
@@ -63,9 +65,17 @@ public static void initializeHandlers() {
             }
             final var packet = Packets.AttackAnimation.read(buf);
             final var forwardBuffer = new Packets.AttackAnimation(player.getId(), packet.animatedHand(), packet.animationName(), packet.length(), packet.upswing()).write();
+            try {
+                //send info back for Replaymod Compat
+                if (ServerPlayNetworking.canSend(player, Packets.AttackAnimation.ID)) {
+                    ServerPlayNetworking.send(player, Packets.AttackAnimation.ID, forwardBuffer);
+                }
+            } catch (Exception e){
+                e.printStackTrace();
+            }
             PlayerLookup.tracking(player).forEach(serverPlayer -> {
                 try {
-                    if (serverPlayer.getId() != player.getId() && ServerPlayNetworking.canSend(serverPlayer, Packets.AttackAnimation.ID)) {
+                    if (ServerPlayNetworking.canSend(serverPlayer, Packets.AttackAnimation.ID)) {
                         ServerPlayNetworking.send(serverPlayer, Packets.AttackAnimation.ID, forwardBuffer);
                     }
                 } catch (Exception e){