--- ../src_base/common/net/minecraft/src/EntityPlayerMP.java +++ ../src_work/common/net/minecraft/src/EntityPlayerMP.java @@ -8,6 +8,9 @@ import java.util.LinkedList; import java.util.List; import net.minecraft.server.MinecraftServer; +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerDropsEvent; public class EntityPlayerMP extends EntityPlayer implements ICrafting { @@ -85,17 +88,10 @@ par4ItemInWorldManager.thisPlayerMP = this; this.theItemInWorldManager = par4ItemInWorldManager; this.renderDistance = par1MinecraftServer.getConfigurationManager().getViewDistance(); - ChunkCoordinates var5 = par2World.getSpawnPoint(); + ChunkCoordinates var5 = par2World.provider.getRandomizedSpawnPoint(); int var6 = var5.posX; int var7 = var5.posZ; int var8 = var5.posY; - - if (!par2World.provider.hasNoSky && par2World.getWorldInfo().getGameType() != EnumGameType.ADVENTURE) - { - var6 += this.rand.nextInt(20) - 10; - var8 = par2World.getTopSolidOrLiquidBlock(var6, var7); - var7 += this.rand.nextInt(20) - 10; - } this.setLocationAndAngles((double)var6 + 0.5D, (double)var8, (double)var7 + 0.5D, 0.0F, 0.0F); this.mcServer = par1MinecraftServer; @@ -336,8 +332,27 @@ */ public void onDeath(DamageSource par1DamageSource) { + if (ForgeHooks.onLivingDeath(this, par1DamageSource)) + { + return; + } + this.mcServer.getConfigurationManager().sendPacketToAllPlayers(new Packet3Chat(par1DamageSource.getDeathMessage(this))); + + captureDrops = true; + capturedDrops.clear(); + this.inventory.dropAllItems(); + + captureDrops = false; + PlayerDropsEvent event = new PlayerDropsEvent(this, par1DamageSource, capturedDrops, recentlyHit > 0); + if (!MinecraftForge.EVENT_BUS.post(event)) + { + for (EntityItem item : capturedDrops) + { + joinEntityItemWithWorld(item); + } + } } /**