From b872252771fb65b4e6629039fa95c3185b2188d0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 18 Aug 2018 23:02:10 -0400
Subject: [PATCH] Removed unnecessary tungsten references

---
 core/src/io/anuke/mindustry/content/Items.java             | 7 ++++++-
 core/src/io/anuke/mindustry/content/Recipes.java           | 1 -
 .../mindustry/world/blocks/distribution/ItemBridge.java    | 2 ++
 .../anuke/mindustry/world/blocks/distribution/Router.java  | 2 +-
 .../src/io/anuke/mindustry/world/blocks/storage/Vault.java | 3 +--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java
index 3666c39c0d..e3e7735047 100644
--- a/core/src/io/anuke/mindustry/content/Items.java
+++ b/core/src/io/anuke/mindustry/content/Items.java
@@ -8,11 +8,16 @@ import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemType;
 
 public class Items implements ContentList{
-    public static Item stone, lead, coal, carbide, titanium, thorium, silicon, plastanium, phasematter, surgealloy,
+    public static Item stone, aluminum, lead, coal, carbide, titanium, thorium, silicon, plastanium, phasematter, surgealloy,
             biomatter, sand, blastCompound, pyratite;
 
     @Override
     public void load(){
+        aluminum = new Item("aluminum", Color.valueOf("8e85a2")){{
+            type = ItemType.material;
+            hardness = 1;
+            cost = 0.6f;
+        }};
 
         lead = new Item("lead", Color.valueOf("8e85a2")){{
             type = ItemType.material;
diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java
index 7d2b17db88..6198a600ca 100644
--- a/core/src/io/anuke/mindustry/content/Recipes.java
+++ b/core/src/io/anuke/mindustry/content/Recipes.java
@@ -13,7 +13,6 @@ public class Recipes implements ContentList{
     @Override
     public void load(){
         //WALLS
-
         /*
         new Recipe(defense, DefenseBlocks.tungstenWall, new ItemStack(Items.tungsten, 12));
         new Recipe(defense, DefenseBlocks.tungstenWallLarge, new ItemStack(Items.tungsten, 12 * 4));
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
index 90a0f3f9b7..1c0c175038 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
@@ -242,6 +242,8 @@ public class ItemBridge extends Block{
 
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
+        if(tile.getTeamID() != source.getTeamID()) return false;
+
         ItemBridgeEntity entity = tile.entity();
         Tile other = world.tile(entity.link);
         boolean linked = false;
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
index 0c262fa768..2613959488 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
@@ -49,7 +49,7 @@ public class Router extends Block{
     public boolean acceptItem(Item item, Tile tile, Tile source){
         SplitterEntity entity = tile.entity();
 
-        return entity.lastItem == null;
+        return tile.getTeamID() == source.getTeamID() && entity.lastItem == null;
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java b/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java
index 09eedd0061..5ea67aeac0 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java
@@ -1,7 +1,6 @@
 package io.anuke.mindustry.world.blocks.storage;
 
 import com.badlogic.gdx.utils.Array;
-import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Edges;
@@ -68,7 +67,7 @@ public class Vault extends StorageBlock{
                     }
                 }
             }else{
-                todump = Items.tungsten;
+                todump = Item.getByID(0);
 
                 if(other.block().acceptItem(todump, other, in) && canDump(tile, other, todump)){
                     other.block().handleItem(removeItem(tile, null), other, in);