fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved various typos

Browse Source
This commit is contained in:
thatsIch
2014-11-04 12:32:33 +01:00
parent fe7510d607
commit 542c1dcdbd
15 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/spatial/CachedPlane.java
+6 -6
View File
@@ -159,14 +159,14 @@ public class CachedPlane
for (int cx = 0; cx < cx_size; cx++)
for (int cz = 0; cz < cz_size; cz++)
{
LinkedList<Entry<ChunkPosition, TileEntity>> rwarTiles = new LinkedList<Entry<ChunkPosition, TileEntity>>();
LinkedList<Entry<ChunkPosition, TileEntity>> rawTiles = new LinkedList<Entry<ChunkPosition, TileEntity>>();
LinkedList<ChunkPosition> deadTiles = new LinkedList<ChunkPosition>();
Chunk c = w.getChunkFromChunkCoords( minCX + cx, minCZ + cz );
myChunks[cx][cz] = c;
rwarTiles.addAll( ((HashMap<ChunkPosition, TileEntity>) c.chunkTileEntityMap).entrySet() );
for (Entry<ChunkPosition, TileEntity> tx : rwarTiles)
rawTiles.addAll( ( ( HashMap<ChunkPosition, TileEntity> ) c.chunkTileEntityMap ).entrySet() );
for (Entry<ChunkPosition, TileEntity> tx : rawTiles)
{
ChunkPosition cp = tx.getKey();
TileEntity te = tx.getValue();
@@ -324,13 +324,13 @@ public class CachedPlane
world.scheduleBlockUpdate( x + x_offset, y + y_offset, z + z_offset, entry.func_151351_a(), (int) entry.scheduledTime );
}
private void addTile(int x, int y, int z, TileEntity te, CachedPlane alternateDest, IMovableRegistry mr)
private void addTile(int x, int y, int z, TileEntity te, CachedPlane alternateDestination, IMovableRegistry mr)
{
try
{
Column c = myColumns[x][z];
if ( c.doNotSkip( y + y_offset ) || alternateDest == null )
if ( c.doNotSkip( y + y_offset ) || alternateDestination == null )
{
IMovableHandler handler = getHandler( te );
@@ -362,7 +362,7 @@ public class CachedPlane
}
else
{
alternateDest.addTile( x, y, z, te, null, mr );
alternateDestination.addTile( x, y, z, te, null, mr );
}
}
catch (Throwable e)
src/main/java/appeng/spatial/StorageHelper.java
+6 -6
View File
@@ -94,17 +94,17 @@ public class StorageHelper
static class METeleporter extends Teleporter
{
final TelDestination dest;
final TelDestination destination;
public METeleporter(WorldServer par1WorldServer, TelDestination d) {
super( par1WorldServer );
dest = d;
destination = d;
}
@Override
public void placeInPortal(Entity par1Entity, double par2, double par4, double par6, float par8)
{
par1Entity.setLocationAndAngles( dest.x, dest.y, dest.z, par1Entity.rotationYaw, 0.0F );
par1Entity.setLocationAndAngles( destination.x, destination.y, destination.z, par1Entity.rotationYaw, 0.0F );
par1Entity.motionX = par1Entity.motionY = par1Entity.motionZ = 0.0D;
}
@@ -175,8 +175,8 @@ public class StorageHelper
// load the chunk!
WorldServer.class.cast( newWorld ).getChunkProvider().loadChunk( MathHelper.floor_double( link.x ) >> 4, MathHelper.floor_double( link.z ) >> 4 );
boolean difDest = newWorld != oldWorld;
if ( difDest )
boolean diffDestination = newWorld != oldWorld;
if ( diffDestination )
{
if ( player != null )
{
@@ -310,7 +310,7 @@ public class StorageHelper
transverseEdges( i, j, k, i + scaleX, j + scaleY, k + scaleZ, new TriggerUpdates( dst ) );
/*
* IChunkProvider cp = dest.getChunkProvider(); if ( cp instanceof ChunkProviderServer ) { ChunkProviderServer
* IChunkProvider cp = destination.getChunkProvider(); if ( cp instanceof ChunkProviderServer ) { ChunkProviderServer
* srv = (ChunkProviderServer) cp; srv.unloadAllChunks(); }
*
* cp.unloadQueuedChunks();