upstream/ThaumicTinkerer
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicTinkerer.git synced 2026-10-25 20:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #829 Prevented Dislocator from moving entities created upon block movement

Browse Source
This commit is contained in:
nekosune committed 2016-02-04 15:35:19 +00:00
1 parent f3a167dc8a
commit 5874de06d7
1 file changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/thaumic/tinkerer/common/block/tile/transvector/TileTransvectorDislocator.java
+7 -6
View File
@@ -63,7 +63,11 @@ public class TileTransvectorDislocator extends TileTransvector {
ChunkCoordinates endCoords = new ChunkCoordinates(x, y, z);
ChunkCoordinates targetCoords = getBlockTarget();
List<Entity> entitiesAtEnd = getEntitiesAtPoint(endCoords);
List<Entity> entitiesAtTarget = getEntitiesAtPoint(targetCoords);
Vector3 targetToEnd = asVector(targetCoords, endCoords);
Vector3 endToTarget = asVector(endCoords, targetCoords);
if (worldObj.blockExists(x, y, z)) {
BlockData endData = new BlockData(endCoords);
BlockData targetData = new BlockData(targetCoords);
@@ -75,17 +79,14 @@ public class TileTransvectorDislocator extends TileTransvector {
endData.setTo(targetCoords);
targetData.setTo(endCoords);
endData.notify(targetCoords);
targetData.notify(endCoords);
}
}
List<Entity> entitiesAtEnd = getEntitiesAtPoint(endCoords);
List<Entity> entitiesAtTarget = getEntitiesAtPoint(targetCoords);
Vector3 targetToEnd = asVector(targetCoords, endCoords);
Vector3 endToTarget = asVector(endCoords, targetCoords);
for (Entity entity : entitiesAtEnd)
moveEntity(entity, endToTarget);
for (Entity entity : entitiesAtTarget)