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

mess cleanup

Browse Source
This commit is contained in:
Anuken
2018-06-02 00:47:22 -04:00
parent ba805739b0
commit 3fe7e4e8da
11 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/io/anuke/mindustry/net/Administration.java
View File

@@ -2,17 +2,16 @@ package io.anuke.mindustry.net;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.Json;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Placement;
import io.anuke.mindustry.world.blocks.types.BlockPart;
import io.anuke.mindustry.world.blocks.types.Floor;
import io.anuke.mindustry.world.blocks.types.Rock;
import io.anuke.mindustry.world.blocks.types.StaticBlock;
import io.anuke.ucore.core.Settings;
import static io.anuke.mindustry.Vars.world;
public class Administration {
@@ -87,8 +86,10 @@ public class Administration {
Block result = log.block;
int rotation = log.rotation;
//TODO fix this mess, broken with 4.0
if(log.action == EditLog.EditAction.PLACE) {
Placement.breakBlock(x, y, false, false);
// Build.breakBlock(x, y, false, false);
Packets.BreakPacket packet = new Packets.BreakPacket();
packet.x = (short) x;
@@ -98,14 +99,14 @@ public class Administration {
Net.send(packet, Net.SendMode.tcp);
}
else if(log.action == EditLog.EditAction.BREAK) {
Placement.placeBlock(x, y, result, rotation, false, false);
//Build.placeBlock(x, y, result, rotation, false, false);
Packets.PlacePacket packet = new Packets.PlacePacket();
packet.x = (short) x;
packet.y = (short) y;
packet.rotation = (byte) rotation;
packet.playerid = 0;
packet.block = result.id;
//packet.block = result.id;
Net.send(packet, Net.SendMode.tcp);
}

1
core/src/io/anuke/mindustry/net/NetEvents.java
View File

@@ -125,7 +125,6 @@ public class NetEvents {
BlockLogRequestPacket packet = new BlockLogRequestPacket();
packet.x = x;
packet.y = y;
packet.editlogs = Vars.currentEditLogs;
Net.send(packet, SendMode.udp);
}