Merge pull request #1 from GreyMario/patch-1
Fixed the NEI breaking bug. ------------------ Thank you!
This commit is contained in:
commit
74c1bc4cf4
3 changed files with 108 additions and 41 deletions
|
@ -56,6 +56,8 @@ public class BlockDimWallPerm extends Block
|
||||||
{
|
{
|
||||||
link =new LinkData(0,0,0,0);
|
link =new LinkData(0,0,0,0);
|
||||||
}
|
}
|
||||||
|
link.destDimID = 0;
|
||||||
|
link.locDimID = par1World.provider.dimensionId;
|
||||||
|
|
||||||
|
|
||||||
if(dimHelper.getWorld(0)==null)
|
if(dimHelper.getWorld(0)==null)
|
||||||
|
@ -74,22 +76,27 @@ public class BlockDimWallPerm extends Block
|
||||||
x = x + (x >> 4);
|
x = x + (x >> 4);
|
||||||
z = z + (z >> 4);
|
z = z + (z >> 4);
|
||||||
|
|
||||||
int y = yCoordHelper.getFirstUncovered(0, x, 63, z);
|
int y = yCoordHelper.getFirstUncovered(0, x, 63, z, true);
|
||||||
|
|
||||||
EntityPlayer.class.cast(par5Entity).setPositionAndUpdate( x, y, z );
|
EntityPlayer.class.cast(par5Entity).setPositionAndUpdate( x, y, z );
|
||||||
//this complicated chunk teleports the player back to the overworld at some random location. Looks funky becaue it has to load the chunk
|
//this complicated chunk teleports the player back to the overworld at some random location. Looks funky becaue it has to load the chunk
|
||||||
|
link.destXCoord = x;
|
||||||
FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().transferPlayerToDimension((EntityPlayerMP) par5Entity, 0,new BlankTeleporter((WorldServer)par5Entity.worldObj));
|
link.destYCoord = y;
|
||||||
|
link.destZCoord = z;
|
||||||
|
dimHelper.instance.teleportEntity(par1World, par5Entity, link);
|
||||||
|
//FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().transferPlayerToDimension((EntityPlayerMP) par5Entity, 0,new BlankTeleporter((WorldServer)par5Entity.worldObj));
|
||||||
//dimHelper.instance.teleportToPocket(par1World, new LinkData(par1World.provider.dimensionId,0,x,y,z,link.locXCoord,link.locYCoord,link.locZCoord,link.isLocPocket,0),
|
//dimHelper.instance.teleportToPocket(par1World, new LinkData(par1World.provider.dimensionId,0,x,y,z,link.locXCoord,link.locYCoord,link.locZCoord,link.isLocPocket,0),
|
||||||
// EntityPlayer.class.cast(par5Entity));
|
// EntityPlayer.class.cast(par5Entity));
|
||||||
|
|
||||||
|
|
||||||
EntityPlayer.class.cast(par5Entity).setPositionAndUpdate( x, y, z );
|
EntityPlayer.class.cast(par5Entity).setPositionAndUpdate( x, y, z );
|
||||||
|
|
||||||
//makes sure they can breath when they teleport
|
// Make absolutely sure the player doesn't spawn inside blocks, though to be honest this shouldn't ever have to be a problem...
|
||||||
dimHelper.getWorld(0).setBlock(x, y, z, 0);
|
dimHelper.getWorld(0).setBlock(x, y, z, 0);
|
||||||
|
dimHelper.getWorld(0).setBlock(x, y+1, z, 0);
|
||||||
|
|
||||||
int i=x;
|
int i=x;
|
||||||
int j=y-1;
|
int j=y;
|
||||||
int k=z;
|
int k=z;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -102,28 +102,46 @@ public class dimHelper extends DimensionManager
|
||||||
else return 1;
|
else return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Entity teleportEntity(World oldWorld, Entity entity, LinkData link) //this beautiful teleport method is based off of xCompWiz's teleport function.
|
// GreyMaria: My god, what a mess. Here, let me clean it up a bit.
|
||||||
{
|
public Entity teleportEntity(World world, Entity entity, LinkData link) //this beautiful teleport method is based off of xCompWiz's teleport function.
|
||||||
Entity cart=entity.ridingEntity;
|
{
|
||||||
if(entity.riddenByEntity!=null)
|
WorldServer oldWorld = (WorldServer)world;
|
||||||
|
WorldServer newWorld;
|
||||||
|
EntityPlayerMP player = (entity instanceof EntityPlayerMP) ? (EntityPlayerMP)entity : null;
|
||||||
|
|
||||||
|
/*// SPECIAL CASE: Is our link null? If so, we've likely come from Limbo. Ensure this is the case.
|
||||||
|
if(link == null)
|
||||||
|
{
|
||||||
|
if(world.provider.dimensionId == DDProperties.instance().LimboDimensionID)
|
||||||
|
{
|
||||||
|
link = new LinkData(0, 0, 0, 0);
|
||||||
|
// Find destination point.
|
||||||
|
}
|
||||||
|
}*/
|
||||||
|
|
||||||
|
|
||||||
|
// Is something riding? Handle it first.
|
||||||
|
if(entity.riddenByEntity != null)
|
||||||
{
|
{
|
||||||
return this.teleportEntity(oldWorld,entity.riddenByEntity, link);
|
return this.teleportEntity(oldWorld,entity.riddenByEntity, link);
|
||||||
}
|
}
|
||||||
|
// Are we riding something? Dismount and tell the mount to go first.
|
||||||
if (entity.ridingEntity != null)
|
Entity cart = entity.ridingEntity;
|
||||||
|
if (cart != null)
|
||||||
{
|
{
|
||||||
entity.mountEntity(null);
|
entity.mountEntity(null);
|
||||||
cart = teleportEntity(oldWorld, cart, link);
|
cart = teleportEntity(oldWorld, cart, link);
|
||||||
|
// We keep track of both so we can remount them on the other side.
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldServer newWorld;
|
// Destination doesn't exist? We need to make it.
|
||||||
|
|
||||||
if(DimensionManager.getWorld(link.destDimID)==null)
|
if(DimensionManager.getWorld(link.destDimID)==null)
|
||||||
{
|
{
|
||||||
DimensionManager.initDimension(link.destDimID);
|
DimensionManager.initDimension(link.destDimID);
|
||||||
}
|
}
|
||||||
boolean difDest = link.destDimID != link.locDimID;
|
|
||||||
|
|
||||||
|
// Determine if our destination's in another realm.
|
||||||
|
boolean difDest = link.destDimID != link.locDimID;
|
||||||
if(difDest)
|
if(difDest)
|
||||||
{
|
{
|
||||||
newWorld = DimensionManager.getWorld(link.destDimID);
|
newWorld = DimensionManager.getWorld(link.destDimID);
|
||||||
|
@ -133,40 +151,47 @@ public class dimHelper extends DimensionManager
|
||||||
newWorld=(WorldServer)oldWorld;
|
newWorld=(WorldServer)oldWorld;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GreyMaria: What is this even accomplishing? We're doing the exact same thing at the end of this all.
|
||||||
|
// TODO Check to see if this is actually vital.
|
||||||
mod_pocketDim.teleporter.placeInPortal(entity, newWorld, link);
|
mod_pocketDim.teleporter.placeInPortal(entity, newWorld, link);
|
||||||
|
|
||||||
if ((entity instanceof EntityPlayerMP))
|
if (difDest) // Are we moving our target to a new dimension?
|
||||||
{
|
{
|
||||||
EntityPlayerMP player = (EntityPlayerMP)entity;
|
if(player != null) // Are we working with a player?
|
||||||
if (difDest)
|
{
|
||||||
{
|
// We need to do all this special stuff to move a player between dimensions.
|
||||||
GameRegistry.onPlayerChangedDimension((EntityPlayer)entity);
|
|
||||||
|
// Set the new dimension and inform the client that it's moving to a new world.
|
||||||
player.dimension = link.destDimID;
|
player.dimension = link.destDimID;
|
||||||
player.playerNetServerHandler.sendPacketToPlayer(new Packet9Respawn(player.dimension, (byte)player.worldObj.difficultySetting, newWorld.getWorldInfo().getTerrainType(), newWorld.getHeight(), player.theItemInWorldManager.getGameType()));
|
player.playerNetServerHandler.sendPacketToPlayer(new Packet9Respawn(player.dimension, (byte)player.worldObj.difficultySetting, newWorld.getWorldInfo().getTerrainType(), newWorld.getHeight(), player.theItemInWorldManager.getGameType()));
|
||||||
|
|
||||||
WorldServer.class.cast(oldWorld).removeEntity(player);
|
// GreyMaria: Used the safe player entity remover.
|
||||||
|
// This should fix an apparently unreported bug where
|
||||||
|
// the last non-sleeping player leaves the Overworld
|
||||||
|
// for a pocket dimension, causing all sleeping players
|
||||||
|
// to remain asleep instead of progressing to day.
|
||||||
|
oldWorld.removePlayerEntityDangerously(player);
|
||||||
player.isDead=false;
|
player.isDead=false;
|
||||||
|
|
||||||
oldWorld.playerEntities.remove(player);
|
// Creates sanity by ensuring that we're only known to exist where we're supposed to be known to exist.
|
||||||
WorldServer.class.cast(oldWorld).getPlayerManager().removePlayer(player);
|
oldWorld.getPlayerManager().removePlayer(player);
|
||||||
newWorld.getPlayerManager().addPlayer(player);
|
newWorld.getPlayerManager().addPlayer(player);
|
||||||
|
|
||||||
player.theItemInWorldManager.setWorld((WorldServer)newWorld);
|
player.theItemInWorldManager.setWorld((WorldServer)newWorld);
|
||||||
|
|
||||||
|
// Synchronize with the server so the client knows what time it is and what it's holding.
|
||||||
player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, (WorldServer)newWorld);
|
player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, (WorldServer)newWorld);
|
||||||
player.mcServer.getConfigurationManager().syncPlayerInventory(player);
|
player.mcServer.getConfigurationManager().syncPlayerInventory(player);
|
||||||
|
|
||||||
for(Object potionEffect : player.getActivePotionEffects())
|
for(Object potionEffect : player.getActivePotionEffects())
|
||||||
{
|
{
|
||||||
PotionEffect effect = (PotionEffect)potionEffect;
|
PotionEffect effect = (PotionEffect)potionEffect;
|
||||||
player.playerNetServerHandler.sendPacketToPlayer(new Packet41EntityEffect(player.entityId, effect));
|
player.playerNetServerHandler.sendPacketToPlayer(new Packet41EntityEffect(player.entityId, effect));
|
||||||
}
|
}
|
||||||
|
|
||||||
player.playerNetServerHandler.sendPacketToPlayer(new Packet43Experience(player.experience, player.experienceTotal, player.experienceLevel));
|
player.playerNetServerHandler.sendPacketToPlayer(new Packet43Experience(player.experience, player.experienceTotal, player.experienceLevel));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if(difDest)
|
// Creates sanity by removing the entity from its old location's chunk entity list, if applicable.
|
||||||
{
|
|
||||||
int entX = entity.chunkCoordX;
|
int entX = entity.chunkCoordX;
|
||||||
int entZ = entity.chunkCoordZ;
|
int entZ = entity.chunkCoordZ;
|
||||||
if ((entity.addedToChunk) && (oldWorld.getChunkProvider().chunkExists(entX, entZ)))
|
if ((entity.addedToChunk) && (oldWorld.getChunkProvider().chunkExists(entX, entZ)))
|
||||||
|
@ -174,8 +199,10 @@ public class dimHelper extends DimensionManager
|
||||||
oldWorld.getChunkFromChunkCoords(entX, entZ).removeEntity(entity);
|
oldWorld.getChunkFromChunkCoords(entX, entZ).removeEntity(entity);
|
||||||
oldWorld.getChunkFromChunkCoords(entX, entZ).isModified = true;
|
oldWorld.getChunkFromChunkCoords(entX, entZ).isModified = true;
|
||||||
}
|
}
|
||||||
|
// Memory concerns.
|
||||||
oldWorld.releaseEntitySkin(entity);
|
oldWorld.releaseEntitySkin(entity);
|
||||||
if (!(entity instanceof EntityPlayer))
|
|
||||||
|
if (player == null) // Are we NOT working with a player?
|
||||||
{
|
{
|
||||||
NBTTagCompound entityNBT = new NBTTagCompound();
|
NBTTagCompound entityNBT = new NBTTagCompound();
|
||||||
entity.isDead = false;
|
entity.isDead = false;
|
||||||
|
@ -183,26 +210,42 @@ public class dimHelper extends DimensionManager
|
||||||
entity.isDead = true;
|
entity.isDead = true;
|
||||||
entity = EntityList.createEntityFromNBT(entityNBT, newWorld);
|
entity = EntityList.createEntityFromNBT(entityNBT, newWorld);
|
||||||
|
|
||||||
if (entity == null)
|
if (entity == null)
|
||||||
{
|
{ // TODO FIXME IMPLEMENT NULL CHECKS THAT ACTUALLY DO SOMETHING.
|
||||||
|
/*
|
||||||
|
* shit ourselves in an organized fashion, preferably
|
||||||
|
* in a neat pile instead of all over our users' games
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Finally, respawn the entity in its new home.
|
||||||
newWorld.spawnEntityInWorld(entity);
|
newWorld.spawnEntityInWorld(entity);
|
||||||
entity.setWorld(newWorld);
|
entity.setWorld(newWorld);
|
||||||
}
|
}
|
||||||
entity.worldObj.updateEntityWithOptionalForce(entity, false);
|
entity.worldObj.updateEntityWithOptionalForce(entity, false);
|
||||||
if ((entity != null) && (cart != null))
|
|
||||||
|
// Hey, remember me? It's time to remount.
|
||||||
|
if (cart != null)
|
||||||
{
|
{
|
||||||
if ((entity instanceof EntityPlayerMP))
|
// Was there a player teleported? If there was, it's important that we update shit.
|
||||||
|
if (player != null)
|
||||||
{
|
{
|
||||||
entity.worldObj.updateEntityWithOptionalForce(entity, true);
|
entity.worldObj.updateEntityWithOptionalForce(entity, true);
|
||||||
}
|
}
|
||||||
entity.mountEntity(cart);
|
entity.mountEntity(cart);
|
||||||
}
|
}
|
||||||
if(entity instanceof EntityPlayerMP)
|
|
||||||
|
// Did we teleport a player? Load the chunk for them.
|
||||||
|
if(player != null)
|
||||||
{
|
{
|
||||||
WorldServer.class.cast(newWorld).getChunkProvider().loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4);
|
WorldServer.class.cast(newWorld).getChunkProvider().loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4);
|
||||||
|
|
||||||
|
// Tell Forge we're moving its players so everyone else knows.
|
||||||
|
// Let's try doing this down here in case this is what's killing NEI.
|
||||||
|
GameRegistry.onPlayerChangedDimension((EntityPlayer)entity);
|
||||||
|
|
||||||
}
|
}
|
||||||
mod_pocketDim.teleporter.placeInPortal(entity, newWorld, link);
|
mod_pocketDim.teleporter.placeInPortal(entity, newWorld, link);
|
||||||
return entity;
|
return entity;
|
||||||
|
|
|
@ -21,6 +21,9 @@ public class yCoordHelper
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getFirstUncovered(int worldID, int x, int yStart, int z)
|
public static int getFirstUncovered(int worldID, int x, int yStart, int z)
|
||||||
|
{ return getFirstUncovered(worldID, x, yStart, z, false); }
|
||||||
|
|
||||||
|
public static int getFirstUncovered(int worldID, int x, int yStart, int z, boolean fromTop)
|
||||||
{
|
{
|
||||||
if (dimHelper.getWorld(worldID) == null ||
|
if (dimHelper.getWorld(worldID) == null ||
|
||||||
dimHelper.getWorld(worldID).provider == null)
|
dimHelper.getWorld(worldID).provider == null)
|
||||||
|
@ -28,10 +31,13 @@ public class yCoordHelper
|
||||||
dimHelper.initDimension(worldID);
|
dimHelper.initDimension(worldID);
|
||||||
}
|
}
|
||||||
|
|
||||||
return yCoordHelper.getFirstUncovered(dimHelper.getWorld(worldID), x, yStart, z);
|
return yCoordHelper.getFirstUncovered(dimHelper.getWorld(worldID), x, yStart, z, fromTop);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getFirstUncovered(World world, int x, int yStart, int z)
|
public static int getFirstUncovered(World world, int x, int yStart, int z)
|
||||||
|
{ return getFirstUncovered(world, x, yStart, z, false); }
|
||||||
|
|
||||||
|
public static int getFirstUncovered(World world, int x, int yStart, int z, boolean fromTop)
|
||||||
{
|
{
|
||||||
Chunk chunk = world.getChunkProvider().loadChunk(x >> 4, z >> 4);
|
Chunk chunk = world.getChunkProvider().loadChunk(x >> 4, z >> 4);
|
||||||
|
|
||||||
|
@ -40,10 +46,21 @@ public class yCoordHelper
|
||||||
int height = MAXIMUM_UNCOVERED_Y; //world.getHeight();
|
int height = MAXIMUM_UNCOVERED_Y; //world.getHeight();
|
||||||
int y;
|
int y;
|
||||||
|
|
||||||
boolean covered = true;
|
if(!fromTop)
|
||||||
for (y = yStart; y < height && covered; y++)
|
|
||||||
{
|
{
|
||||||
covered = IsCoveredBlock(chunk, localX, y - 1, localZ) || IsCoveredBlock(chunk, localX, y, localZ);
|
boolean covered = true;
|
||||||
|
for (y = yStart; y < height && covered; y++)
|
||||||
|
{
|
||||||
|
covered = IsCoveredBlock(chunk, localX, y - 1, localZ) || IsCoveredBlock(chunk, localX, y, localZ);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
boolean covered = false;
|
||||||
|
for (y = MAXIMUM_UNCOVERED_Y; y > 1 && !covered; y--)
|
||||||
|
{
|
||||||
|
covered = IsCoveredBlock(chunk, localX, y - 1, localZ);
|
||||||
|
}
|
||||||
|
if (!covered) y = 63;
|
||||||
|
y++;
|
||||||
}
|
}
|
||||||
|
|
||||||
return y;
|
return y;
|
||||||
|
@ -69,4 +86,4 @@ public class yCoordHelper
|
||||||
material = block.blockMaterial;
|
material = block.blockMaterial;
|
||||||
return (material.isLiquid() || !material.isReplaceable());
|
return (material.isLiquid() || !material.isReplaceable());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue