Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

limbo fix

Browse source
This commit is contained in:
StevenRS11 2014-05-26 22:14:20 -04:00
parent 844950b39e
commit 77241e6f90
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
View file

@ -6,6 +6,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemDoor; import net.minecraft.item.ItemDoor;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.event.sound.PlayBackgroundMusicEvent; import net.minecraftforge.client.event.sound.PlayBackgroundMusicEvent;
import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.client.event.sound.SoundLoadEvent;
@ -150,13 +151,24 @@ public class EventHookContainer
Entity entity = event.entity; Entity entity = event.entity;
if (properties.LimboEnabled && properties.LimboReturnsInventoryEnabled && if (properties.LimboEnabled && properties.LimboReturnsInventoryEnabled &&
entity instanceof EntityPlayer && entity.worldObj.provider instanceof PocketProvider) entity instanceof EntityPlayer)
{ {
EntityPlayer player = (EntityPlayer) entity; if(entity.worldObj.provider instanceof PocketProvider)
mod_pocketDim.deathTracker.addUsername(player.username); {
revivePlayerInLimbo(player); EntityPlayer player = (EntityPlayer) entity;
event.setCanceled(true); mod_pocketDim.deathTracker.addUsername(player.username);
return false; revivePlayerInLimbo(player);
event.setCanceled(true);
return false;
}
else if(entity.worldObj.provider instanceof LimboProvider && event.source == DamageSource.outOfWorld)
{
EntityPlayer player = (EntityPlayer) entity;
revivePlayerInLimbo(player);
mod_pocketDim.sendChat(player, "Search for the dark red pools which accumulate in the lower reaches of Limbo");
event.setCanceled(true);
return false;
}
} }
return true; return true;
} }

13
src/main/java/StevenDimDoors/mod_pocketDim/world/PersonalPocketProvider.java
View file

@ -64,19 +64,6 @@ public class PersonalPocketProvider extends PocketProvider
return this.worldObj.getWorldVec3Pool().getVecFromPool(.89, .89, .89); return this.worldObj.getWorldVec3Pool().getVecFromPool(.89, .89, .89);
} }
@Override
public int getRespawnDimension(EntityPlayerMP player)
{
return this.dimensionId;
}
//TODO only owning player can respawn here
@Override
public boolean canRespawnHere()
{
return true;
}
@Override @Override
public int getActualHeight() public int getActualHeight()
{ {