Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into TDK

Browse source
This commit is contained in:
LemADEC 2014-09-19 02:11:40 +02:00
commit a123ab45f7
6 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/assets/warpdrive/textures/blocks/liftUpDown.png.mcmeta
View file

@ -1,4 +0,0 @@
{
"animation": {
}
}

BIN
src/assets/warpdrive/textures/blocks/liftUpIn.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

3
src/assets/warpdrive/textures/blocks/liftUpIn.png.mcmeta
View file

@ -1,4 +1,5 @@
{
"animation": {
"frametime": 6
}
}
}

BIN
src/assets/warpdrive/textures/blocks/liftUpOut.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

3
src/assets/warpdrive/textures/blocks/liftUpOut.png.mcmeta
View file

@ -1,4 +1,5 @@
{
"animation": {
"frametime": 6
}
}
}

2
src/cr0s/WarpDrive/machines/TileEntityLift.java
View file

@ -118,7 +118,7 @@ public class TileEntityLift extends WarpEnergyTE implements IPeripheral {
}
}
} else if (mode == MODE_DOWN) {
AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(xmin, firstUncoveredY + 2.5D, zmin, xmax, yCoord + 2.5D, zmax);
AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(xmin, Math.min(firstUncoveredY + 4.0D, yCoord), zmin, xmax, yCoord + 2.0D, zmax);
List list = worldObj.getEntitiesWithinAABBExcludingEntity(null, aabb);
if (list != null) {
for (Object o : list) {