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

Merge fixes

Browse Source
This commit is contained in:
Anuken
2018-03-03 18:08:35 -05:00
parent 6de48b4535
commit 41e4f87e06
3 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Sat Mar 03 12:04:38 EST 2018 #Sat Mar 03 18:05:41 EST 2018
version=release version=release
androidBuildCode=333 androidBuildCode=335
name=Mindustry name=Mindustry
code=3.4 code=3.4
build=30 build=custom build

22
core/src/io/anuke/mindustry/core/NetClient.java
View File

@@ -164,7 +164,7 @@ public class NetClient extends Module {
}); });
Net.handleClient(PlacePacket.class, (packet) -> { Net.handleClient(PlacePacket.class, (packet) -> {
Placement.placeBlock(packet.x, packet.y, Block.getByID(packet.block), packet.rotation, true, false); Placement.placeBlock(packet.x, packet.y, Block.getByID(packet.block), packet.rotation, true, Timers.get("placeblocksound", 10));
if(packet.playerid == player.id){ if(packet.playerid == player.id){
Tile tile = world.tile(packet.x, packet.y); Tile tile = world.tile(packet.x, packet.y);
@@ -173,7 +173,7 @@ public class NetClient extends Module {
}); });
Net.handleClient(BreakPacket.class, (packet) -> { Net.handleClient(BreakPacket.class, (packet) -> {
Placement.breakBlock(packet.x, packet.y, true, false); Placement.breakBlock(packet.x, packet.y, true, Timers.get("breakblocksound", 10));
}); });
Net.handleClient(EntitySpawnPacket.class, packet -> { Net.handleClient(EntitySpawnPacket.class, packet -> {
@@ -262,11 +262,7 @@ public class NetClient extends Module {
next.block().handleItem(Item.getByID(packet.itemid), next, tile); next.block().handleItem(Item.getByID(packet.itemid), next, tile);
}; };
if(threads.isEnabled()){ threads.run(r);
threads.run(r);
}else{
r.run();
}
}); });
Net.handleClient(ItemSetPacket.class, packet -> { Net.handleClient(ItemSetPacket.class, packet -> {
@@ -276,11 +272,7 @@ public class NetClient extends Module {
tile.entity.items[packet.itemid] = packet.amount; tile.entity.items[packet.itemid] = packet.amount;
}; };
if(threads.isEnabled()){ threads.run(r);
threads.run(r);
}else{
r.run();
}
}); });
Net.handleClient(ItemOffloadPacket.class, packet -> { Net.handleClient(ItemOffloadPacket.class, packet -> {
@@ -291,11 +283,7 @@ public class NetClient extends Module {
next.block().handleItem(Item.getByID(packet.itemid), next, tile); next.block().handleItem(Item.getByID(packet.itemid), next, tile);
}; };
if(threads.isEnabled()){ threads.run(r);
threads.run(r);
}else{
r.run();
}
}); });
Net.handleClient(NetErrorPacket.class, packet -> { Net.handleClient(NetErrorPacket.class, packet -> {

5
core/src/io/anuke/mindustry/world/Tile.java
View File

@@ -231,6 +231,11 @@ public class Tile{
return world.tile(x + relative.x, y + relative.y); return world.tile(x + relative.x, y + relative.y);
} }
public Tile target(){
Tile link = getLinked();
return link == null ? this : link;
}
public Tile getNearby(int rotation){ public Tile getNearby(int rotation){
if(rotation == 0) return world.tile(x + 1, y); if(rotation == 0) return world.tile(x + 1, y);
if(rotation == 1) return world.tile(x, y + 1); if(rotation == 1) return world.tile(x, y + 1);