# Conflicts:
#	src/de/steamwar/bungeecore/listeners/ChatListener.java

@@ -44,1 +44,4 @@
         }
+        event.setCancelled(true);
+
+        if (!(event.getReceiver() instanceof ProxiedPlayer)) {

@@ -0,0 +41,4 @@
+            field = InitialHandler.class.getDeclaredField("extraDataInHandshake");
+            field.setAccessible(true);
+        } catch (Exception e) {
+            BungeeCord.getInstance().stop();

@@ -0,0 +47,4 @@
+
+    @EventHandler
+    public void loginEvent(LoginEvent e) {
+        System.out.println(e);

@@ -0,0 +55,4 @@
+            if (properties.length > 0) {
+                extraData += "\00" + BungeeCord.getInstance().gson.toJson(properties);
+            }
+            field.set(initialHandler, extraData);

@@ -0,0 +57,4 @@
+            }
+            field.set(initialHandler, extraData);
+        } catch (Exception ex) {
+            BungeeCord.getInstance().stop();

@@ -552,0 +614,4 @@
+        }
+        team.setAddress(server);
+        team.setPort(port);
+        Message.send("TEAM_SERVER_SET", player);

@@ -0,0 +41,4 @@
+            field = InitialHandler.class.getDeclaredField("extraDataInHandshake");
+            field.setAccessible(true);
+        } catch (Exception e) {
+            // ignore

@@ -0,0 +56,4 @@
+            }
+            field.set(initialHandler, extraData);
+        } catch (Exception ex) {
+            // ignore

@@ -375,6 +376,7 @@ TEAM_HELP_NAME=§8/§7team changename §8- §7Ändere deinen Teamnamen.
 TEAM_HELP_COLOR=§8/§7team changecolor §8- §7Ändere deine Teamfarbe.
 TEAM_HELP_LEADER=§8/§7team promote §8- §7Ernenne jemanden zum Teamleader.
 TEAM_HELP_STEP_BACK=§8/§7team stepback §8- §7Tritt als Leader zurück.
+TEAM_HELP_SERVER=§8/§7team server §8[§eIP/Address§8] §8(§7Port§8) §8- §7Setzt Addresse des Teamservers.

@@ -461,2 +463,4 @@
 TEAM_COLOR_TITLE=Farbe wählen
 
+#Team Server
+TEAM_SERVER_USAGE=§8/§7team server §8[§eIP/Address§8] §8(§7Port§8) §8- §7Setzt Addresse des Teamservers.

@@ -463,0 +465,4 @@
+#Team Server
+TEAM_SERVER_USAGE=§8/§7team server §8[§eIP/Address§8] §8(§7Port§8) §8- §7Setzt Addresse des Teamservers.
+TEAM_SERVER_SET=§7Du hast die Teamserveradresse geändert§8!
+TEAM_SERVER_PORT_INVALID=§cDer Port muss eine Zahl sein.