From c05336ac9f21f3af7caa81f28c4b043c5175ca42 Mon Sep 17 00:00:00 2001
From: Nicholas Ignoffo <nick@tehnut.info>
Date: Sat, 17 Feb 2018 16:27:57 -0800
Subject: [PATCH] "Temporarily" disable cross-dimension entity teleports

---
 .../item/sigil/ItemSigilTeleposition.java     |  6 +++--
 .../bloodmagic/tile/TileTeleposer.java        | 26 ++++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java
index ea744f7f..38535e96 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java
@@ -56,9 +56,11 @@ public class ItemSigilTeleposition extends ItemSigilBase {
             BlockPos blockPos = new BlockPos(getValue(stack.getTagCompound(), Constants.NBT.X_COORD), getValue(stack.getTagCompound(), Constants.NBT.Y_COORD), getValue(stack.getTagCompound(), Constants.NBT.Z_COORD)).up();
             if (world.provider.getDimension() == getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID)) {
                 TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getOwnerUUID(stack), true));
-            } else {
-                TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true));
             }
+            // FIXME - Fix cross-dimension teleports causing major desync
+//            } else {
+//                TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true));
+//            }
         }
         return super.onItemRightClick(world, player, hand);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java
index dc2317c8..f91052d9 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java
@@ -104,19 +104,21 @@ public class TileTeleposer extends TileInventory implements ITickable {
                                 TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), true));
                             }
                         }
-                    } else {
-                        if (!originalWorldEntities.isEmpty()) {
-                            for (Entity entity : originalWorldEntities) {
-                                TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), getWorld(), focusWorld.provider.getDimension(), true));
-                            }
-                        }
-
-                        if (!focusWorldEntities.isEmpty()) {
-                            for (Entity entity : focusWorldEntities) {
-                                TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), focusWorld, getWorld().provider.getDimension(), true));
-                            }
-                        }
                     }
+                    // FIXME - Fix cross-dimension teleports causing major desync
+//                    } else {
+//                        if (!originalWorldEntities.isEmpty()) {
+//                            for (Entity entity : originalWorldEntities) {
+//                                TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), getWorld(), focusWorld.provider.getDimension(), true));
+//                            }
+//                        }
+//
+//                        if (!focusWorldEntities.isEmpty()) {
+//                            for (Entity entity : focusWorldEntities) {
+//                                TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), focusWorld, getWorld().provider.getDimension(), true));
+//                            }
+//                        }
+//                    }
                 }
             }
         }