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

Merge remote-tracking branch 'upstream/rv2' into rv2

Browse Source 
Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java
This commit is contained in:
Andrew
2014-09-29 00:26:15 -07:00
parent fd18393a8b 72106c877d
commit 5c5aaa21ee
113 changed files with 410 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/hooks/CompassManager.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class CompassManager
}
HashMap<CompassRequest, CompassResult> requests = new HashMap();
HashMap<CompassRequest, CompassResult> requests = new HashMap<CompassRequest, CompassResult>();
public void postResult(long attunement, int x, int y, int z, CompassResult result)
{
src/main/java/appeng/hooks/TickHandler.java
+5 -5
View File
@@ -43,13 +43,13 @@ public class TickHandler
class HandlerRep
{
public Queue<AEBaseTile> tiles = new LinkedList();
public Queue<AEBaseTile> tiles = new LinkedList<AEBaseTile>();
public Collection<Grid> networks = new NetworkList();
public void clear()
{
tiles = new LinkedList();
tiles = new LinkedList<AEBaseTile>();
networks = new NetworkList();
}
@@ -83,8 +83,8 @@ public class TickHandler
}
final private HashMap<Integer, PlayerColor> cliPlayerColors = new HashMap();
final private HashMap<Integer, PlayerColor> srvPlayerColors = new HashMap();
final private HashMap<Integer, PlayerColor> cliPlayerColors = new HashMap<Integer, PlayerColor>();
final private HashMap<Integer, PlayerColor> srvPlayerColors = new HashMap<Integer, PlayerColor>();
public HashMap<Integer, PlayerColor> getPlayerColors()
{
@@ -159,7 +159,7 @@ public class TickHandler
{
if ( Platform.isServer() ) // for no there is no reason to care about this on the client...
{
LinkedList<IGridNode> toDestroy = new LinkedList();
LinkedList<IGridNode> toDestroy = new LinkedList<IGridNode>();
for (Grid g : getRepo().networks)
{