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 lenses not syncing correctly on the server when converting Item entities

Browse source
This commit is contained in:
Ellpeck 2016-01-17 01:50:35 +01:00
parent a4f2251ff6
commit 957acd8ab8
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java
View file

@ -20,6 +20,7 @@ import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
@ -71,15 +72,22 @@ public class LensColor extends Lens{
ArrayList<EntityItem> items = (ArrayList<EntityItem>)tile.getWorldObject().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.fromBounds(hitBlock.getX(), hitBlock.getY(), hitBlock.getZ(), hitBlock.getX()+1, hitBlock.getY()+1, hitBlock.getZ()+1)); ArrayList<EntityItem> items = (ArrayList<EntityItem>)tile.getWorldObject().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.fromBounds(hitBlock.getX(), hitBlock.getY(), hitBlock.getZ(), hitBlock.getX()+1, hitBlock.getY()+1, hitBlock.getZ()+1));
for(EntityItem item : items){ for(EntityItem item : items){
if(item.getEntityItem() != null && tile.getEnergy() >= ENERGY_USE){ if(!item.isDead && item.getEntityItem() != null && tile.getEnergy() >= ENERGY_USE){
if(Util.arrayContains(CONVERTABLE_BLOCKS, item.getEntityItem().getItem()) >= 0 || Util.arrayContains(CONVERTABLE_BLOCKS, Block.getBlockFromItem(item.getEntityItem().getItem())) >= 0){ if(Util.arrayContains(CONVERTABLE_BLOCKS, item.getEntityItem().getItem()) >= 0 || Util.arrayContains(CONVERTABLE_BLOCKS, Block.getBlockFromItem(item.getEntityItem().getItem())) >= 0){
int meta = item.getEntityItem().getItemDamage(); ItemStack newStack = item.getEntityItem().copy();
int meta = newStack.getItemDamage();
if(meta >= 15){ if(meta >= 15){
item.getEntityItem().setItemDamage(0); newStack.setItemDamage(0);
} }
else{ else{
item.getEntityItem().setItemDamage(meta+1); newStack.setItemDamage(meta+1);
} }
item.setDead();
EntityItem newItem = new EntityItem(tile.getWorldObject(), item.posX, item.posY, item.posZ, newStack);
tile.getWorldObject().spawnEntityInWorld(newItem);
tile.extractEnergy(ENERGY_USE); tile.extractEnergy(ENERGY_USE);
} }
} }

8
src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNone.java
View file

@ -65,7 +65,7 @@ public class LensNone extends Lens{
ArrayList<EntityItem> items = (ArrayList<EntityItem>)tile.getWorldObject().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.fromBounds(hitBlock.getX()-range, hitBlock.getY()-range, hitBlock.getZ()-range, hitBlock.getX()+range, hitBlock.getY()+range, hitBlock.getZ()+range)); ArrayList<EntityItem> items = (ArrayList<EntityItem>)tile.getWorldObject().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.fromBounds(hitBlock.getX()-range, hitBlock.getY()-range, hitBlock.getZ()-range, hitBlock.getX()+range, hitBlock.getY()+range, hitBlock.getZ()+range));
for(EntityItem item : items){ for(EntityItem item : items){
ItemStack stack = item.getEntityItem(); ItemStack stack = item.getEntityItem();
if(stack != null){ if(!item.isDead && stack != null){
List<LensNoneRecipe> recipes = LensNoneRecipeHandler.getRecipesFor(stack); List<LensNoneRecipe> recipes = LensNoneRecipeHandler.getRecipesFor(stack);
for(LensNoneRecipe recipe : recipes){ for(LensNoneRecipe recipe : recipes){
if(recipe != null && tile.getEnergy() >= recipe.energyUse){ if(recipe != null && tile.getEnergy() >= recipe.energyUse){
@ -73,7 +73,11 @@ public class LensNone extends Lens{
if(outputs != null && !outputs.isEmpty()){ if(outputs != null && !outputs.isEmpty()){
ItemStack outputCopy = outputs.get(0).copy(); ItemStack outputCopy = outputs.get(0).copy();
outputCopy.stackSize = stack.stackSize; outputCopy.stackSize = stack.stackSize;
item.setEntityItemStack(outputCopy);
item.setDead();
EntityItem newItem = new EntityItem(tile.getWorldObject(), item.posX, item.posY, item.posZ, outputCopy);
tile.getWorldObject().spawnEntityInWorld(newItem);
tile.extractEnergy(recipe.energyUse); tile.extractEnergy(recipe.energyUse);
break; break;