early out in getAssetObfuscation

PaperMC · Jan 4, 2025 · 16dbb25 · 16dbb25
1 parent eccf1aa
commit 16dbb25
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/...hes/sources/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java.patch b/...hes/sources/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java.patch
@@ -4,7 +4,7 @@
      }
 
      private static void pack(List<SynchedEntityData.DataValue<?>> dataValues, RegistryFriendlyByteBuf buffer) {
-+        try (io.papermc.paper.util.ItemObfuscationSession ignored = io.papermc.paper.util.ItemObfuscationSession.start(io.papermc.paper.util.ItemObfuscationBinding.LEVEL)) { // Paper - data sanitization
++        try (io.papermc.paper.util.ItemObfuscationSession ignored = io.papermc.paper.util.ItemObfuscationSession.start(io.papermc.paper.configuration.GlobalConfiguration.get().anticheat.obfuscation.items.binding.level)) { // Paper - data sanitization
          for (SynchedEntityData.DataValue<?> dataValue : dataValues) {
              dataValue.write(buffer);
          }

diff --git a/...ches/sources/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java.patch b/...ches/sources/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java.patch
@@ -18,7 +18,7 @@
          buffer.writeVarInt(this.entity);
          int size = this.slots.size();
 
-+        try (final io.papermc.paper.util.ItemObfuscationSession ignored = io.papermc.paper.util.ItemObfuscationSession.start(this.sanitize ? io.papermc.paper.util.ItemObfuscationBinding.LEVEL : io.papermc.paper.util.ItemObfuscationSession.ObfuscationLevel.NONE)) { // Paper - data sanitization
++        try (final io.papermc.paper.util.ItemObfuscationSession ignored = io.papermc.paper.util.ItemObfuscationSession.start(this.sanitize ? io.papermc.paper.configuration.GlobalConfiguration.get().anticheat.obfuscation.items.binding.level : io.papermc.paper.util.ItemObfuscationSession.ObfuscationLevel.NONE)) { // Paper - data sanitization
          for (int i = 0; i < size; i++) {
              Pair<EquipmentSlot, ItemStack> pair = this.slots.get(i);
              EquipmentSlot equipmentSlot = pair.getFirst();

diff --git a/paper-server/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/paper-server/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -391,7 +391,7 @@ public class Items extends ConfigurationPart {
 
                 @PostProcess
                 public void bindDataSanitizer() {
-                    this.binding = new ItemObfuscationBinding(GlobalConfiguration.this);
+                    this.binding = new ItemObfuscationBinding(this);
                 }
             }
         }

diff --git a/paper-server/src/main/java/io/papermc/paper/util/ItemObfuscationBinding.java b/paper-server/src/main/java/io/papermc/paper/util/ItemObfuscationBinding.java
@@ -26,8 +26,7 @@ public final class ItemObfuscationBinding {
     private final BoundObfuscationConfiguration base;
     private final Map<ResourceLocation, BoundObfuscationConfiguration> overrides;
 
-    public ItemObfuscationBinding(final GlobalConfiguration config) {
-        final GlobalConfiguration.Anticheat.Obfuscation.Items items = config.anticheat.obfuscation.items;
+    public ItemObfuscationBinding(final GlobalConfiguration.Anticheat.Obfuscation.Items items) {
         this.level = items.enableItemObfuscation ? ItemObfuscationSession.ObfuscationLevel.ALL : ItemObfuscationSession.ObfuscationLevel.OVERSIZED;
         this.base = bind(items.allModels);
         final Map<ResourceLocation, BoundObfuscationConfiguration> overrides = new HashMap<>();
@@ -79,6 +78,9 @@ private static BoundObfuscationConfiguration bind(final AssetObfuscationConfigur
     }
 
     public BoundObfuscationConfiguration getAssetObfuscation(final ItemStack itemStack) {
+        if (this.overrides.isEmpty()) {
+            return this.base;
+        }
         return this.overrides.getOrDefault(itemStack.get(DataComponents.ITEM_MODEL), this.base);
     }