From 2a08134ad6752075e812d55a61080545e5e681a7 Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 29 Apr 2023 00:47:52 +0900 Subject: [PATCH] Fix crash with Ars Magica (#304) * Fix crash with Ars Magica * Address review --- .git-blame-ignore-revs | 1 + src/main/java/appeng/parts/AEBasePart.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index eeb5e351a25..3af0eda6961 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,3 @@ # Ignore spotlessApply reformat +a40ee7424f59aafd3f9e187a95bbb5cb91ec5697 385e163974b86edd071cac928bc7671d02d1da57 diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 6219365bccf..4d960140d2f 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -11,10 +11,7 @@ package appeng.parts; import java.io.IOException; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.Random; +import java.util.*; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.crash.CrashReportCategory; @@ -420,7 +417,7 @@ public final boolean onActivate(final EntityPlayer player, final Vec3 pos) { x, y, z, - this.side.flag, + getSideIndexFromDirection(this.side), player.getEntityWorld()); if (event.isCanceled()) return false; @@ -439,7 +436,7 @@ public final boolean onShiftActivate(final EntityPlayer player, final Vec3 pos) x, y, z, - this.side.flag, + getSideIndexFromDirection(this.side), player.getEntityWorld()); if (event.isCanceled()) return false; @@ -498,4 +495,11 @@ public ISimplifiedBundle getRenderCache() { public void setRenderCache(final ISimplifiedBundle renderCache) { this.renderCache = renderCache; } + + private static int getSideIndexFromDirection(ForgeDirection direction) { + if (direction == ForgeDirection.UNKNOWN || direction == null) { + return -1; + } + return direction.ordinal(); + } }