Better support for modded servers

GrimAnticheat · Jul 14, 2024 · 78e3fdb · 78e3fdb
1 parent 59004e6
commit 78e3fdb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/main/java/ac/grim/grimac/utils/data/packetentity/PacketEntity.java b/src/main/java/ac/grim/grimac/utils/data/packetentity/PacketEntity.java
@@ -86,6 +86,7 @@ protected void initAttributes(GrimPlayer player) {
     }
 
     public Optional<ValuedAttribute> getAttribute(Attribute attribute) {
+        if (attribute == null) return Optional.empty();
         return Optional.ofNullable(attributeMap.get(attribute));
     }
 

diff --git a/src/main/java/ac/grim/grimac/utils/latency/CompensatedEntities.java b/src/main/java/ac/grim/grimac/utils/latency/CompensatedEntities.java
@@ -156,6 +156,7 @@ public void updateAttributes(int entityID, List<WrapperPlayServerUpdateAttribute
 
         if (entity instanceof PacketEntityHorse) {
             for (WrapperPlayServerUpdateAttributes.Property snapshotWrapper : objects) {
+                if (snapshotWrapper.getAttribute() == null) continue;
                 if (snapshotWrapper.getKey().toUpperCase().contains("MOVEMENT")) {
                     entity.getAttribute(Attributes.GENERIC_MOVEMENT_SPEED).get().with(snapshotWrapper);
                 }
@@ -168,6 +169,7 @@ public void updateAttributes(int entityID, List<WrapperPlayServerUpdateAttribute
 
         if (entity instanceof PacketEntityRideable) {
             for (WrapperPlayServerUpdateAttributes.Property snapshotWrapper : objects) {
+                if (snapshotWrapper.getAttribute() == null) continue;
                 if (snapshotWrapper.getKey().toUpperCase().contains("MOVEMENT")) {
                     entity.getAttribute(Attributes.GENERIC_MOVEMENT_SPEED).get().with(snapshotWrapper);
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,6 +86,7 @@ protected void initAttributes(GrimPlayer player) { @@
         }
         public Optional<ValuedAttribute> getAttribute(Attribute attribute) {
+            if (attribute == null) return Optional.empty();
             return Optional.ofNullable(attributeMap.get(attribute));
         }
@@ Expand Down @@