diff --git a/src/main/java/re/imc/geysermodelengine/model/EntityTask.java b/src/main/java/re/imc/geysermodelengine/model/EntityTask.java index 3e86c74..b4153c0 100644 --- a/src/main/java/re/imc/geysermodelengine/model/EntityTask.java +++ b/src/main/java/re/imc/geysermodelengine/model/EntityTask.java @@ -210,7 +210,6 @@ public class EntityTask { EntityUtils.sendCustomScale(player, model.getEntity().getEntityId(), average); - if (ignore) return; lastScale = average; } @@ -222,7 +221,6 @@ public class EntityTask { EntityUtils.sendCustomColor(player, model.getEntity().getEntityId(), color); - if (ignore) return; lastColor = color; } @@ -338,8 +336,6 @@ public class EntityTask { String id = "animation." + activeModel.getBlueprint().getName().toLowerCase() + "." + animationProperty.getName().toLowerCase(); lastAnimation = id; - model.getViewers().forEach(viewer -> viewer.sendActionBar("CURRENT AN:" + id)); - animationCooldown.set((int) (animationProperty.getLength() * 20)); playBedrockAnimation(id, model.getViewers(), looping, blendTime); } diff --git a/src/main/java/re/imc/geysermodelengine/packet/EntityHurtAnimationPacket.java b/src/main/java/re/imc/geysermodelengine/packet/EntityHurtPacket.java similarity index 56% rename from src/main/java/re/imc/geysermodelengine/packet/EntityHurtAnimationPacket.java rename to src/main/java/re/imc/geysermodelengine/packet/EntityHurtPacket.java index d4a20be..9d5bf67 100644 --- a/src/main/java/re/imc/geysermodelengine/packet/EntityHurtAnimationPacket.java +++ b/src/main/java/re/imc/geysermodelengine/packet/EntityHurtPacket.java @@ -3,19 +3,22 @@ package re.imc.geysermodelengine.packet; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; -public class EntityHurtAnimationPacket implements WrapperPacket { +public class EntityHurtPacket implements WrapperPacket { private final int id; - public EntityHurtAnimationPacket(int id) { + public EntityHurtPacket(int id) { this.id = id; } @Override public PacketContainer encode() { - PacketContainer packet = new PacketContainer(PacketType.Play.Server.HURT_ANIMATION); + PacketContainer packet = new PacketContainer(PacketType.Play.Server.DAMAGE_EVENT); packet.getIntegers().write(0, id); - packet.getFloat().write(0, 5f); + packet.getIntegers().write(1,0); + packet.getIntegers().write(2, 0); + packet.getIntegers().write(3, 0); + packet.getBooleans().write(0, false); return packet; } } diff --git a/src/main/java/re/imc/geysermodelengine/packet/entity/PacketEntity.java b/src/main/java/re/imc/geysermodelengine/packet/entity/PacketEntity.java index 6fada20..21026b2 100644 --- a/src/main/java/re/imc/geysermodelengine/packet/entity/PacketEntity.java +++ b/src/main/java/re/imc/geysermodelengine/packet/entity/PacketEntity.java @@ -54,12 +54,12 @@ public class PacketEntity { public void sendSpawnPacket(Collection players) { EntitySpawnPacket packet = new EntitySpawnPacket(id, uuid, type, location); - EntityMetadataPacket metadataPacket = new EntityMetadataPacket(id); + // EntityMetadataPacket metadataPacket = new EntityMetadataPacket(id); players.forEach(player -> { ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet.encode()); }); - players.forEach(player -> ProtocolLibrary.getProtocolManager().sendServerPacket(player, metadataPacket.encode())); + // players.forEach(player -> ProtocolLibrary.getProtocolManager().sendServerPacket(player, metadataPacket.encode())); } public void sendLocationPacket(Collection players) { @@ -69,7 +69,7 @@ public class PacketEntity { } public void sendHurtPacket(Collection players) { - EntityHurtAnimationPacket packet = new EntityHurtAnimationPacket(id); + EntityHurtPacket packet = new EntityHurtPacket(id); players.forEach(player -> ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet.encode())); }