Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a couple of things.

Browse source 
Hopefully all works now. >_>
This commit is contained in:
Ellpeck 2016-06-11 23:43:28 +02:00
parent 4144f03d14
commit e9fa9bca92
4 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java
View file

@ -76,7 +76,10 @@ public class BlockGiantChest extends BlockContainerBase{
ItemStack[] slots = ((TileEntityGiantChest)tile).slots; ItemStack[] slots = ((TileEntityGiantChest)tile).slots;
for(int i = 0; i < list.tagCount(); i++){ for(int i = 0; i < list.tagCount(); i++){
slots[i] = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(i)); NBTTagCompound compound = list.getCompoundTagAt(i);
if(compound != null && compound.hasKey("id")){
slots[i] = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(i));
}
} }
} }
} }

12
src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java
View file

@ -48,10 +48,16 @@ public class WorldData{
int dim = world.provider.getDimension(); int dim = world.provider.getDimension();
WorldData data = worldData.get(dim); WorldData data = worldData.get(dim);
if(data == null && world.isRemote){ if(data == null){
data = new WorldData(null, dim); data = new WorldData(null, dim);
worldData.put(dim, data);
ModUtil.LOGGER.info("Creating temporary WorldData for world "+dim+" on the client!"); if(world.isRemote){
worldData.put(dim, data);
ModUtil.LOGGER.info("Creating temporary WorldData for world "+dim+" on the client!");
}
else{
ModUtil.LOGGER.warn("Trying to get WorldData from world "+dim+" that doesn't have any data!? This shouldn't happen!");
}
} }
return data; return data;

8
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java
View file

@ -59,9 +59,11 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements
NBTTagList tagList = compound.getTagList("Items", 10); NBTTagList tagList = compound.getTagList("Items", 10);
for(int i = 0; i < tagList.tagCount(); i++){ for(int i = 0; i < tagList.tagCount(); i++){
NBTTagCompound tagCompound = tagList.getCompoundTagAt(i); NBTTagCompound tagCompound = tagList.getCompoundTagAt(i);
byte slotIndex = tagCompound.getByte("Slot"); if(tagCompound != null && tagCompound.hasKey("id")){
if(slotIndex >= 0 && slotIndex < slots.length){ byte slotIndex = tagCompound.getByte("Slot");
slots[slotIndex] = ItemStack.loadItemStackFromNBT(tagCompound); if(slotIndex >= 0 && slotIndex < slots.length){
slots[slotIndex] = ItemStack.loadItemStackFromNBT(tagCompound);
}
} }
} }
} }

14
src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
View file

@ -340,8 +340,16 @@ public class WorldUtil{
* @return If the Block could be harvested normally (so that it drops an item) * @return If the Block could be harvested normally (so that it drops an item)
*/ */
public static boolean playerHarvestBlock(World world, BlockPos pos, EntityPlayer player){ public static boolean playerHarvestBlock(World world, BlockPos pos, EntityPlayer player){
Block block = PosUtil.getBlock(pos, world);
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
if(state == null){
return false;
}
Block block = state.getBlock();
if(block == null){
return false;
}
TileEntity tile = world.getTileEntity(pos); TileEntity tile = world.getTileEntity(pos);
ItemStack stack = player.getHeldItemMainhand(); ItemStack stack = player.getHeldItemMainhand();
@ -351,7 +359,8 @@ public class WorldUtil{
//Send Block Breaking Event //Send Block Breaking Event
int xp = -1; int xp = -1;
if(player instanceof EntityPlayerMP){ if(player instanceof EntityPlayerMP){
xp = ForgeHooks.onBlockBreakEvent(world, ((EntityPlayerMP)player).interactionManager.getGameType(), (EntityPlayerMP)player, pos); EntityPlayerMP playerMP = (EntityPlayerMP)player;
xp = ForgeHooks.onBlockBreakEvent(world, playerMP.interactionManager.getGameType(), playerMP, pos);
if(xp == -1){ if(xp == -1){
return false; return false;
} }
@ -397,6 +406,7 @@ public class WorldUtil{
//Check the Server if a Block that changed on the Client really changed, if not, revert the change //Check the Server if a Block that changed on the Client really changed, if not, revert the change
Minecraft.getMinecraft().getConnection().sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.STOP_DESTROY_BLOCK, pos, Minecraft.getMinecraft().objectMouseOver.sideHit)); Minecraft.getMinecraft().getConnection().sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.STOP_DESTROY_BLOCK, pos, Minecraft.getMinecraft().objectMouseOver.sideHit));
} }
return removed; return removed;
} }
} }