mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Fix wonky petal apothecary collision
This commit is contained in:
1 parent
300b1926de
commit
4a4e583aa8
3 files changed
+7
-8
No files matched your search
@@ -74,17 +74,17 @@ public class BlockAltar extends BlockModContainer implements ILexiconable {
|
||||
|
||||
@Override
|
||||
public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity) {
|
||||
if (collidingEntity instanceof EntityItem) {
|
||||
float f = 1F / 16F * 2F;
|
||||
//if (collidingEntity instanceof EntityItem) {
|
||||
/*float f = 1F / 16F * 2F;
|
||||
|
||||
// Todo 1.8 temporary hack to let items collide from the top. Figure out what changed to break this.
|
||||
setBlockBounds(f, f, f, 1F - f, 0.65F, 1F -f);
|
||||
super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
|
||||
setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f);
|
||||
return;
|
||||
} else {
|
||||
return;*/
|
||||
//} else {
|
||||
super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
|
||||
}
|
||||
//}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -227,10 +227,9 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I
|
||||
|
||||
@Override
|
||||
public void updateEntity() {
|
||||
List<EntityItem> items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 21D,1)));
|
||||
List<EntityItem> items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 32D, 1)));
|
||||
|
||||
boolean didChange = false;
|
||||
|
||||
for(EntityItem item : items)
|
||||
didChange = collideEntityItem(item) || didChange;
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ public class TileMod extends TileEntity implements ITickable {
|
||||
|
||||
@Override
|
||||
public final void update() {
|
||||
if (worldObj.isBlockLoaded(getPos(), false)) {
|
||||
if (!isInvalid() && worldObj.isBlockLoaded(getPos(), false)) {
|
||||
updateEntity();
|
||||
} else {
|
||||
System.out.println("Skipping a tick because our chunk unloaded");
|
||||
|
||||
Reference in new issue
Block a user