Merge remote-tracking branch 'origin/master'

# Conflicts: # core/src/io/anuke/mindustry/core/NetServer.java
AxKey · Sep 3, 2019 · 35ab90e · 35ab90e
2 parents 316f4d4 + ef0b56e
commit 35ab90e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -9,15 +9,18 @@
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.CommandHandler.*;
 import io.anuke.arc.util.io.*;
-import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
-import io.anuke.mindustry.gen.*;
+import io.anuke.mindustry.content.Blocks;
+import io.anuke.mindustry.core.GameState.State;
+import io.anuke.mindustry.entities.EntityGroup;
+import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
+import io.anuke.mindustry.entities.traits.Entity;
+import io.anuke.mindustry.entities.traits.SyncTrait;
+import io.anuke.mindustry.entities.type.Player;
+import io.anuke.mindustry.game.EventType.WorldLoadEvent;
+import io.anuke.mindustry.game.Team;
+import io.anuke.mindustry.game.Version;
+import io.anuke.mindustry.gen.Call;
+import io.anuke.mindustry.gen.RemoteReadServer;
 import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.net.Administration.*;
@@ -194,6 +197,8 @@ public NetServer(){
             sendWorldData(player, id);
 
             platform.updateRPC();
+
+            Events.fire(new PlayerJoin(player));
         });
 
         Net.handleServer(InvokePacket.class, (id, packet) -> {
@@ -411,6 +416,7 @@ public static void onDisconnect(Player player, String reason){
         }
 
         if(player.con.hasConnected){
+            Events.fire(new PlayerLeave(player));
             Call.sendMessage("[accent]" + player.name + "[accent] has disconnected.");
             Call.onPlayerDisconnect(player.id);
         }

diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java
@@ -5,6 +5,7 @@
 import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.type.Zone;
 import io.anuke.mindustry.world.Tile;
+import io.anuke.mindustry.entities.type.Player;
 
 public class EventType{
 
@@ -184,5 +185,22 @@ public UnitDestroyEvent(Unit unit){
     public static class ResizeEvent{
 
     }
+
+    public static class PlayerJoin{
+        public final Player player;
+
+        public PlayerJoin(Player player){
+            this.player = player;
+        }
+    }
+
+    public static class PlayerLeave{
+        public final Player player;
+
+        public PlayerLeave(Player player){
+            this.player = player;
+        }
+    }
+
 }