lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Gate of the Fold endless loop (#743)

Browse source
This commit is contained in:
Nicholas Ignoffo 2016-05-21 12:57:04 -07:00
parent dce6bf1e93
commit cebf71c329
4 changed files with 45 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
View file

@ -106,20 +106,20 @@ public class BlockDimensionalPortal extends BlockIntegerContainer
PortalLocation portal = linkedLocations.get(1); PortalLocation portal = linkedLocations.get(1);
if (portal.getDimension() == world.provider.getDimension()) if (portal.getDimension() == world.provider.getDimension())
{ {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner())); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), false));
} else } else
{ {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension())); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension(), false));
} }
} else if (linkedLocations.get(1).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimension()))) } else if (linkedLocations.get(1).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimension())))
{ {
PortalLocation portal = linkedLocations.get(0); PortalLocation portal = linkedLocations.get(0);
if (portal.getDimension() == world.provider.getDimension()) if (portal.getDimension() == world.provider.getDimension())
{ {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner())); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), false));
} else } else
{ {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension())); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension(), false));
} }
} }
} }

4
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java
View file

@ -52,10 +52,10 @@ 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(); 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)) if (world.provider.getDimension() == getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID))
{ {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getOwnerUUID(stack))); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(blockPos, player, getOwnerUUID(stack), true));
} else } else
{ {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID))); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(blockPos, player, getOwnerUUID(stack), world, getValue(stack.getTagCompound(), Constants.NBT.DIMENSION_ID), true));
} }
} }
return super.onItemRightClick(stack, world, player, hand); return super.onItemRightClick(stack, world, player, hand);

53
src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java
View file

@ -28,15 +28,17 @@ public class Teleports
public static class TeleportSameDim extends Teleport public static class TeleportSameDim extends Teleport
{ {
private final boolean teleposer;
public TeleportSameDim(int x, int y, int z, Entity entity, String networkToDrain) public TeleportSameDim(int x, int y, int z, Entity entity, String networkToDrain, boolean teleposer)
{ {
super(x, y, z, entity, networkToDrain); this(new BlockPos(x, y, z), entity, networkToDrain, teleposer);
} }
public TeleportSameDim(BlockPos blockPos, Entity entity, String networkToDrain) public TeleportSameDim(BlockPos blockPos, Entity entity, String networkToDrain, boolean teleposer)
{ {
super(blockPos, entity, networkToDrain); super(blockPos, entity, networkToDrain);
this.teleposer = teleposer;
} }
@Override @Override
@ -52,8 +54,9 @@ public class Teleports
if (network.getCurrentEssence() < getTeleportCost()) if (network.getCurrentEssence() < getTeleportCost())
return; return;
if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.worldObj, entity.getPosition(), entity.worldObj, new BlockPos(x, y, z)))) if (teleposer)
return; if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.worldObj, entity.getPosition(), entity.worldObj, new BlockPos(x, y, z))))
return;
network.syphon(getTeleportCost()); network.syphon(getTeleportCost());
@ -65,15 +68,17 @@ public class Teleports
player.timeUntilPortal = 150; player.timeUntilPortal = 150;
player.worldObj.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); player.worldObj.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false);
MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), entity.worldObj, new BlockPos(x, y, z))); if (teleposer)
MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), entity.worldObj, new BlockPos(x, y, z)));
} else } else
{ {
SoulNetwork network = NetworkHelper.getSoulNetwork(networkToDrain); SoulNetwork network = NetworkHelper.getSoulNetwork(networkToDrain);
if (network.getCurrentEssence() < (getTeleportCost() / 10)) if (network.getCurrentEssence() < (getTeleportCost() / 10))
return; return;
if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.worldObj, entity.getPosition(), entity.worldObj, new BlockPos(x, y, z)))) if (teleposer)
return; if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.worldObj, entity.getPosition(), entity.worldObj, new BlockPos(x, y, z))))
return;
network.syphon(getTeleportCost() / 10); network.syphon(getTeleportCost() / 10);
@ -84,7 +89,8 @@ public class Teleports
world.resetUpdateEntityTick(); world.resetUpdateEntityTick();
entity.worldObj.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); entity.worldObj.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false);
MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), entity.worldObj, new BlockPos(x, y, z))); if (teleposer)
MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), entity.worldObj, new BlockPos(x, y, z)));
} }
} }
} }
@ -97,25 +103,24 @@ public class Teleports
} }
} }
@Getter
public static class TeleportToDim extends Teleport public static class TeleportToDim extends Teleport
{ {
@Getter
private World oldWorld; private World oldWorld;
@Getter
private int newWorldID; private int newWorldID;
private boolean teleposer;
public TeleportToDim(int x, int y, int z, Entity entity, String networkToDrain, World oldWorld, int newWorld) public TeleportToDim(int x, int y, int z, Entity entity, String networkToDrain, World oldWorld, int newWorld, boolean teleposer)
{ {
super(x, y, z, entity, networkToDrain); this(new BlockPos(x, y, z), entity, networkToDrain, oldWorld, newWorld, teleposer);
this.oldWorld = oldWorld;
this.newWorldID = newWorld;
} }
public TeleportToDim(BlockPos blockPos, Entity entity, String networkToDrain, World oldWorld, int newWorldID) public TeleportToDim(BlockPos blockPos, Entity entity, String networkToDrain, World oldWorld, int newWorldID, boolean teleposer)
{ {
super(blockPos, entity, networkToDrain); super(blockPos, entity, networkToDrain);
this.oldWorld = oldWorld; this.oldWorld = oldWorld;
this.newWorldID = newWorldID; this.newWorldID = newWorldID;
this.teleposer = teleposer;
} }
@Override @Override
@ -139,8 +144,9 @@ public class Teleports
if (network.getCurrentEssence() < getTeleportCost()) if (network.getCurrentEssence() < getTeleportCost())
return; return;
if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z)))) if (teleposer)
return; if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z))))
return;
network.syphon(getTeleportCost()); network.syphon(getTeleportCost());
@ -149,7 +155,8 @@ public class Teleports
player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5);
player.worldObj.updateEntityWithOptionalForce(player, false); player.worldObj.updateEntityWithOptionalForce(player, false);
player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel()));
MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z))); if (teleposer)
MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z)));
} }
} else if (!entity.worldObj.isRemote) } else if (!entity.worldObj.isRemote)
@ -158,8 +165,9 @@ public class Teleports
if (network.getCurrentEssence() < (getTeleportCost() / 10)) if (network.getCurrentEssence() < (getTeleportCost() / 10))
return; return;
if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z)))) if (teleposer)
return; if (MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z))))
return;
network.syphon(getTeleportCost() / 10); network.syphon(getTeleportCost() / 10);
@ -181,7 +189,8 @@ public class Teleports
oldWorldServer.resetUpdateEntityTick(); oldWorldServer.resetUpdateEntityTick();
newWorldServer.resetUpdateEntityTick(); newWorldServer.resetUpdateEntityTick();
MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z))); if (teleposer)
MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z)));
} }
entity.timeUntilPortal = entity instanceof EntityLiving ? 150 : 20; entity.timeUntilPortal = entity instanceof EntityLiving ? 150 : 20;
newWorldServer.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); newWorldServer.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false);

16
src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java
View file

@ -110,36 +110,36 @@ public class TileTeleposer extends TileInventory implements ITickable
if (focusWorld.equals(worldObj)) if (focusWorld.equals(worldObj))
{ {
if (originalWorldEntities != null && !originalWorldEntities.isEmpty()) if (!originalWorldEntities.isEmpty())
{ {
for (Entity entity : originalWorldEntities) for (Entity entity : originalWorldEntities)
{ {
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))); 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));
} }
} }
if (focusWorldEntities != null && !focusWorldEntities.isEmpty()) if (!focusWorldEntities.isEmpty())
{ {
for (Entity entity : focusWorldEntities) for (Entity entity : focusWorldEntities)
{ {
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))); 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 } else
{ {
if (originalWorldEntities != null && !originalWorldEntities.isEmpty()) if (!originalWorldEntities.isEmpty())
{ {
for (Entity entity : originalWorldEntities) 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), worldObj, focusWorld.provider.getDimension())); 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), worldObj, focusWorld.provider.getDimension(), true));
} }
} }
if (focusWorldEntities != null && !focusWorldEntities.isEmpty()) if (!focusWorldEntities.isEmpty())
{ {
for (Entity entity : focusWorldEntities) 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, worldObj.provider.getDimension())); 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, worldObj.provider.getDimension(), true));
} }
} }
} }