From c2f3c50cb25a574da69bf75b8c9702be236fc551 Mon Sep 17 00:00:00 2001
From: Runemoro <runemoro@users.noreply.github.com>
Date: Sun, 10 Dec 2017 21:12:29 -0500
Subject: [PATCH] Fix gateways

---
 .../com/zixiken/dimdoors/shared/RiftRegistry.java  |  4 +++-
 .../dimdoors/shared/util/SchematicConverter.java   | 14 +++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zixiken/dimdoors/shared/RiftRegistry.java b/src/main/java/com/zixiken/dimdoors/shared/RiftRegistry.java
index 803b24b3..84a86f2e 100644
--- a/src/main/java/com/zixiken/dimdoors/shared/RiftRegistry.java
+++ b/src/main/java/com/zixiken/dimdoors/shared/RiftRegistry.java
@@ -197,7 +197,9 @@ public class RiftRegistry {
     }
 
     void unRegisterUnpairedRiftAtDepth(int riftID) {
-        TileEntity tileEntity = rifts.get(riftID).getTileEntity();
+        Location rift1 = rifts.get(riftID);
+        if (rift1 == null) return;
+        TileEntity tileEntity = rift1.getTileEntity();
         if (tileEntity instanceof DDTileEntityBase) {
             DDTileEntityBase rift = (DDTileEntityBase) tileEntity;
             unRegisterUnpairedRiftAtDepth(rift);
diff --git a/src/main/java/com/zixiken/dimdoors/shared/util/SchematicConverter.java b/src/main/java/com/zixiken/dimdoors/shared/util/SchematicConverter.java
index 6334df0a..49e7e7af 100644
--- a/src/main/java/com/zixiken/dimdoors/shared/util/SchematicConverter.java
+++ b/src/main/java/com/zixiken/dimdoors/shared/util/SchematicConverter.java
@@ -4,6 +4,7 @@ import com.zixiken.dimdoors.DimDoors;
 import com.zixiken.dimdoors.shared.blocks.ModBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.ResourceLocation;
@@ -76,7 +77,14 @@ public class SchematicConverter {
             Map<Integer, Byte> palletteMap = new HashMap<>(); // block ID -> pallette index
             byte currentPalletteIndex = 0;
             for (int i = 0; i < blockIntArray.length; i++) {
-                int id = ((addId[i >> 1] & 0x0F) << 8) + (blockIntArray[i] & 0xFF);
+                int id;
+                if (i >> 1 >= addId.length) {
+                    id = (short) (blockIntArray[i] & 0xFF);
+                } else if ((i & 1) == 0) {
+                    id = (short) (((addId[i >> 1] & 0x0F) << 8) + (blockIntArray[i] & 0xFF));
+                } else {
+                    id = (short) (((addId[i >> 1] & 0xF0) << 4) + (blockIntArray[i] & 0xFF));
+                }
                 if (palletteMap.containsKey(id)) {
                     blockIntArray[i] = palletteMap.get(id);
                 } else {
@@ -91,10 +99,6 @@ public class SchematicConverter {
                         case 1979:
                             block = ModBlocks.TRANSIENT_DIMENSIONAL_DOOR;
                             break;
-                        case 1792:
-                            break;
-                        case 1816:
-                            break;
                     }
                     //if (id != 0  && block.getRegistryName().toString().equals("minecraft:air")) throw new RuntimeException("Change conversion code!");
                     schematic.pallette.add(block.getDefaultState());