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

Bugfixes, added saving/loading maps in editor for web version

Browse Source
This commit is contained in:
Anuken
2018-05-31 23:49:43 -04:00
parent 418467e467
commit 23d07600f7
10 changed files with 103 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,6 @@
package io.anuke.mindustry.net;
import com.badlogic.gdx.utils.Pools;
import io.anuke.annotations.Annotations.Local;
import io.anuke.annotations.Annotations.RemoteClient;
import io.anuke.annotations.Annotations.RemoteServer;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.SyncEntity;
import io.anuke.mindustry.entities.TileEntity;
@@ -18,25 +15,6 @@ import static io.anuke.mindustry.Vars.*;
public class NetEvents {
@RemoteClient
@Local
public static void friendlyFireChange(boolean enabled){
state.friendlyFire = enabled;
if(Net.server()) netCommon.sendMessage(enabled ? "[accent]Friendly fire enabled." : "[accent]Friendly fire disabled.");
}
@RemoteServer
public static void notifySomethingFromClient(Player player, int x, float y, String asdsad, long l){
}
@RemoteClient
@Local
public static void notifySomethingFromServerLocal(int y, float x, boolean w){
}
public static void handleGameOver(){
Net.send(Pools.obtain(GameOverPacket.class), SendMode.tcp);
}
@@ -128,12 +106,6 @@ public class NetEvents {
Net.send(packet, SendMode.tcp);
}
@RemoteClient
@Local
public static void adminSet(Player player, boolean admin){
player.isAdmin = admin;
}
public static void handleAdministerRequest(Player target, AdminAction action){
AdministerRequestPacket packet = Pools.obtain(AdministerRequestPacket.class);
packet.id = target.id;

4
core/src/io/anuke/mindustry/net/Packets.java
View File

@@ -7,7 +7,6 @@ import com.badlogic.gdx.utils.reflect.ReflectionException;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.SyncEntity;
import io.anuke.mindustry.gen.CallClient;
import io.anuke.mindustry.io.Version;
import io.anuke.mindustry.net.Packet.ImportantPacket;
import io.anuke.mindustry.net.Packet.UnimportantPacket;
@@ -42,7 +41,8 @@ public class Packets {
type = buffer.get();
if(Net.client()){
CallClient.readPacket(buffer, type);
//TODO implement
//CallClient.readPacket(buffer, type);
}else{
byte[] bytes = new byte[writeLength];
buffer.get(bytes);