Enforce safe stack copying, fixes #593

ACGaming · Nov 21, 2024 · 3fa1cae · 3fa1cae
1 parent aa0df7d
commit 3fa1cae
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/.../acgaming/universaltweaks/tweaks/misc/pickupnotification/UTPickupNotificationOverlay.java b/.../acgaming/universaltweaks/tweaks/misc/pickupnotification/UTPickupNotificationOverlay.java
@@ -45,7 +45,14 @@ private static boolean isStackEmpty(ItemStack stack)
 
     private static ItemStack safeCopy(ItemStack stack)
     {
-        return stack.copy();
+        try
+        {
+            return stack.copy();
+        }
+        catch (Exception e)
+        {
+            return ItemStack.EMPTY;
+        }
     }
 
     private final List<ChangeInfo> changeEntries = Lists.newArrayList();
@@ -291,12 +298,12 @@ public void utPUNClientTick(TickEvent.ClientTickEvent event)
             ItemStack stack = player.inventory.getStackInSlot(i);
             ItemStack old = previous[i];
             if (isChangeMeaningful(old, stack)) changes.add(Pair.of(old, stack));
-            previous[i] = stack.copy();
+            previous[i] = safeCopy(stack);
         }
 
         ItemStack stackInCursor = player.inventory.getItemStack();
         if (isChangeMeaningful(stackInCursor, previousInCursor)) changes.add(Pair.of(previousInCursor, stackInCursor));
-        previousInCursor = stackInCursor.copy();
+        previousInCursor = safeCopy(stackInCursor);
 
         if (UTConfigTweaks.MISC.PICKUP_NOTIFICATION.utPUNExperience)
         {