Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted syncing

Browse Source
This commit is contained in:
Anuken
2018-02-12 18:48:23 -05:00
parent 7c28ba457d
commit a8a402745f
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Mon Feb 12 17:32:19 EST 2018 #Mon Feb 12 18:20:29 EST 2018
version=beta version=beta
androidBuildCode=177 androidBuildCode=180
name=Mindustry name=Mindustry
code=3.3 code=3.3
build=custom build build=custom build

6
core/src/io/anuke/mindustry/world/Block.java
View File

@@ -151,11 +151,7 @@ public class Block{
public void handleItem(Item item, Tile tile, Tile source){ public void handleItem(Item item, Tile tile, Tile source){
if(tile.entity == null) return; if(tile.entity == null) return;
if(Net.server() || !Net.active()){ tile.entity.addItem(item, 1);
tile.entity.addItem(item, 1);
if(Net.server()) NetEvents.handleItemAdd(tile, item);
}
} }
public boolean acceptItem(Item item, Tile tile, Tile source){ public boolean acceptItem(Item item, Tile tile, Tile source){

11
core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java
View File

@@ -4,8 +4,6 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.ObjectSet; import com.badlogic.gdx.utils.ObjectSet;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.NetEvents;
import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.types.PowerBlock; import io.anuke.mindustry.world.blocks.types.PowerBlock;
@@ -135,13 +133,8 @@ public class Teleporter extends PowerBlock{
Array<Tile> links = findLinks(tile); Array<Tile> links = findLinks(tile);
if(links.size > 0){ if(links.size > 0){
Tile target = links.random();
if(Net.server() || !Net.active()){ target.entity.addItem(item, 1);
Tile target = links.random();
target.entity.addItem(item, 1);
if(Net.server()) NetEvents.handleItemAdd(target, item);
}
} }
entity.power -= powerPerItem; entity.power -= powerPerItem;