apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Minor Fixes

Browse Source 
Cleaned up obsolete code in PocketProvider and fixed the assignment of
hasNoSky so that it actually applies. Also overloaded getActualHeight()
so that we return 256 despite hasNoSky = true - the default MC behavior
is that we would return 128 in that case. Also undid a previous change
to EventHookContainer - players that die in pockets will respawn in
Limbo, again.
This commit is contained in:
SenseiKiwi
2013-09-09 00:42:03 -04:00
parent 9fec41f906
commit 7dbc6896b1
2 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
StevenDimDoors/mod_pocketDim/EventHookContainer.java
View File

@@ -10,11 +10,11 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.living.LivingFallEvent;
import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.event.world.WorldEvent;
import StevenDimDoors.mod_pocketDim.core.DDTeleporter; import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
import StevenDimDoors.mod_pocketDim.core.NewDimData;
import StevenDimDoors.mod_pocketDim.core.PocketManager; import StevenDimDoors.mod_pocketDim.core.PocketManager;
import StevenDimDoors.mod_pocketDim.ticking.RiftRegenerator; import StevenDimDoors.mod_pocketDim.ticking.RiftRegenerator;
import StevenDimDoors.mod_pocketDim.util.Point4D; import StevenDimDoors.mod_pocketDim.util.Point4D;
import StevenDimDoors.mod_pocketDim.world.LimboProvider; import StevenDimDoors.mod_pocketDim.world.LimboProvider;
import StevenDimDoors.mod_pocketDim.world.PocketProvider;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@@ -70,10 +70,8 @@ public class EventHookContainer
{ {
Entity entity = event.entity; Entity entity = event.entity;
if (entity instanceof EntityPlayer && properties.LimboEnabled) if (entity instanceof EntityPlayer && properties.LimboEnabled &&
{ entity.worldObj.provider instanceof PocketProvider)
NewDimData dimension = PocketManager.getDimensionData(entity.worldObj);
if (dimension.isDungeon())
{ {
EntityPlayer player = (EntityPlayer) entity; EntityPlayer player = (EntityPlayer) entity;
if (!properties.LimboReturnsInventoryEnabled) if (!properties.LimboReturnsInventoryEnabled)
@@ -87,7 +85,6 @@ public class EventHookContainer
event.setCanceled(true); event.setCanceled(true);
return false; return false;
} }
}
return true; return true;
} }

32
StevenDimDoors/mod_pocketDim/world/PocketProvider.java
View File

@@ -17,14 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class PocketProvider extends WorldProvider public class PocketProvider extends WorldProvider
{ {
public int exitXCoord;
public int exitYCoord;
public int exitZCoord;
public int exitDimID;
public boolean hasNoSky = true;
public boolean isSavingSchematic= false;
public int dimToSave;
private DDProperties properties; private DDProperties properties;
private MonolithSpawner spawner; private MonolithSpawner spawner;
@@ -38,8 +30,7 @@ public class PocketProvider extends WorldProvider
@Override @Override
protected void registerWorldChunkManager() protected void registerWorldChunkManager()
{ {
super.worldChunkMgr = new WorldChunkManagerHell(mod_pocketDim.pocketBiome,1,1); super.worldChunkMgr = new WorldChunkManagerHell(mod_pocketDim.pocketBiome, 1, 1);
//this.dimensionId = ConfigAtum.dimensionID;
} }
@Override @Override
@@ -48,28 +39,18 @@ public class PocketProvider extends WorldProvider
return (dimensionId == 0 ? null : "DimensionalDoors/pocketDimID" + dimensionId); return (dimensionId == 0 ? null : "DimensionalDoors/pocketDimID" + dimensionId);
} }
public void saveAsSchematic(int id) @Override
{
this.isSavingSchematic=true;
this.dimensionId=id;
}
public Vec3 getSkyColor(Entity cameraEntity, float partialTicks) public Vec3 getSkyColor(Entity cameraEntity, float partialTicks)
{ {
setCloudRenderer( new CloudRenderBlank()); setCloudRenderer( new CloudRenderBlank());
return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0); return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0);
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public Vec3 getFogColor(float par1, float par2) public Vec3 getFogColor(float par1, float par2)
{ {
return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0); return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0);
} }
@Override @Override
@@ -90,6 +71,7 @@ public class PocketProvider extends WorldProvider
return false; return false;
} }
@Override
public boolean canBlockFreeze(int x, int y, int z, boolean byWater) public boolean canBlockFreeze(int x, int y, int z, boolean byWater)
{ {
return false; return false;
@@ -104,6 +86,7 @@ public class PocketProvider extends WorldProvider
return "PocketDim " + this.dimensionId; return "PocketDim " + this.dimensionId;
} }
@Override
public int getRespawnDimension(EntityPlayerMP player) public int getRespawnDimension(EntityPlayerMP player)
{ {
int respawnDim; int respawnDim;
@@ -124,8 +107,15 @@ public class PocketProvider extends WorldProvider
return respawnDim; return respawnDim;
} }
@Override
public boolean canRespawnHere() public boolean canRespawnHere()
{ {
return false; return false;
} }
@Override
public int getActualHeight()
{
return 256;
}
} }