Merge remote-tracking branch 'origin/master'

core/src/io/anuke/mindustry/game/EventType.java

@@ -146,7 +146,7 @@ public class EventType{
         public final Player player;
         public final Item item;
         public final int amount;
-        
+
         public DepositEvent(Tile tile, Player player, Item item, int amount){
             this.tile = tile;
             this.player = player;
@@ -154,7 +154,7 @@ public class EventType{
             this.amount = amount;
         }
     }
-    
+
     /** Called when the player taps a block. */
     public static class TapEvent{
         public final Tile tile;
@@ -165,7 +165,7 @@ public class EventType{
             this.player = player;
         }
     }
-    
+
     /** Called when the player sets a specific block. */
     public static class TapConfigEvent{
         public final Tile tile;
@@ -318,7 +318,7 @@ public class EventType{
     /** Called after connecting; when a player recieves world data and is ready to play.*/
     public static class PlayerJoin{
         public final Player player;
-        
+
         public PlayerJoin(Player player){
             this.player = player;
         }
@@ -335,11 +335,45 @@ public class EventType{
 
     public static class PlayerLeave{
         public final Player player;
-        
+
         public PlayerLeave(Player player){
             this.player = player;
         }
     }
-           
+    
+    public static class PlayerBanEvent{
+        public final Player player;
+
+        public PlayerBanEvent(Player player){
+            this.player = player;
+        }
+    }
+    
+    public static class PlayerUnbanEvent{
+        public final Player player;
+
+        public PlayerUnbanEvent(Player player){
+            this.player = player;
+        }
+    }
+    
+    public static class PlayerIpBanEvent{
+        public final String ip;
+
+
+        public PlayerIpBanEvent(String ip){
+            this.ip = ip;
+        }
+    }
+    
+    public static class PlayerIpUnbanEvent{
+        public final String ip;
+
+
+        public PlayerIpUnbanEvent(String ip){
+            this.ip = ip;
+        }
+    }
+    
 }