upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-14 01:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.11] Fix null checks in shouldCauseReequipAnimation (#3482)

Browse Source
This commit is contained in:
Ben Staddon authored and LexManos committed 2016-12-03 10:47:57 -08:00
1 parent a913a8a0f9
commit 6921ee54f5
1 file changed
+8 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/minecraftforge/client/ForgeHooksClient.java
+8 -5
View File
@@ -669,12 +669,15 @@ public class ForgeHooksClient
}
private static int slotMainHand = 0;
// FIXME
public static boolean shouldCauseReequipAnimation(ItemStack from, ItemStack to, int slot)
public static boolean shouldCauseReequipAnimation(@Nonnull ItemStack from, @Nonnull ItemStack to, int slot)
{
if (from == null && to != null) return true;
if (from == null && to == null) return false;
if (from != null && to == null) return true;
boolean fromInvalid = from.func_190926_b();
boolean toInvalid = to.func_190926_b();
if (fromInvalid && toInvalid) return false;
if (fromInvalid || toInvalid) return true;
boolean changed = false;
if (slot != -1)
{