7a8
> import java.util.HashMap;
10a12
> import java.util.Map;
87a90
>     public Map loadedTileEntityMap = new HashMap(50000);
88a92
>     private Map addedTileEntityMap = new HashMap(50000);
1972a1977
>                         this.loadedTileEntityMap.put(new ChunkPosition(tileentity1.xCoord, tileentity1.yCoord, tileentity1.zCoord), tileentity1);
1989a1995
>             this.addedTileEntityMap.clear();
1998a2005
>         Map dest1 = field_147481_N ? addedTileEntityMap : loadedTileEntityMap;
2001c2008,2012
<             if(entity.canUpdate()) dest.add(entity);
---
>             if(entity.canUpdate()){
>                 dest.add(entity);
>                 dest1.put(new ChunkPosition(entity.xCoord, entity.yCoord, entity.zCoord), entity);
>             }
>
2491c2502
<
---
>             ChunkPosition pos = new ChunkPosition(p_147438_1_, p_147438_2_, p_147438_3_);
2494,2502c2505,2507
<                 for (l = 0; l < this.addedTileEntityList.size(); ++l)
<                 {
<                     tileentity1 = (TileEntity)this.addedTileEntityList.get(l);
<
<                     if (!tileentity1.isInvalid() && tileentity1.xCoord == p_147438_1_ && tileentity1.yCoord == p_147438_2_ && tileentity1.zCoord == p_147438_3_)
<                     {
<                         tileentity = tileentity1;
<                         break;
<                     }
---
>                 tileentity1 = (TileEntity) this.addedTileEntityMap.get(pos);
>                 if (!tileentity1.isInvalid()){
>                     tileentity = tileentity1;
2515d2519
<
2518,2526c2522,2524
<                 for (l = 0; l < this.addedTileEntityList.size(); ++l)
<                 {
<                     tileentity1 = (TileEntity)this.addedTileEntityList.get(l);
<
<                     if (!tileentity1.isInvalid() && tileentity1.xCoord == p_147438_1_ && tileentity1.yCoord == p_147438_2_ && tileentity1.zCoord == p_147438_3_)
<                     {
<                         tileentity = tileentity1;
<                         break;
<                     }
---
>                 tileentity1 = (TileEntity) this.addedTileEntityMap.get(pos);
>                 if (!tileentity1.isInvalid()){
>                     tileentity = tileentity1;
2546a2545
>             ChunkPosition pos = new ChunkPosition(p_147455_1_, p_147455_2_, p_147455_3_);
2548a2548
>
2550,2558c2550,2560
<
<                 while (iterator.hasNext())
<                 {
<                     TileEntity tileentity1 = (TileEntity)iterator.next();
<
<                     if (tileentity1.xCoord == p_147455_1_ && tileentity1.yCoord == p_147455_2_ && tileentity1.zCoord == p_147455_3_)
<                     {
<                         tileentity1.invalidate();
<                         iterator.remove();
---
>                 TileEntity tileentity1 = (TileEntity) this.addedTileEntityMap.get(pos);
>                 if (tileentity1 != null){
>                     tileentity1.invalidate();
>
>                     while (iterator.hasNext())
>                     {
>                         TileEntity tileentity2 = (TileEntity)iterator.next();
>                         if (tileentity2 == tileentity1){
>                             iterator.remove();
>                             break;
>                         }
2561d2562
<
2562a2564
>                 this.addedTileEntityMap.put(pos, p_147455_4_);
2566a2569
>                 this.loadedTileEntityMap.put(pos, p_147455_4_);
3907a3911
>         Map dest1 = field_147481_N ? addedTileEntityMap : loadedTileEntityMap;
3910a3915
>             dest1.put(new ChunkPosition(entity.xCoord, entity.yCoord, entity.zCoord), entity);