diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..05558d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# Logs and databases # +###################### +*.log + +# OS generated files # +###################### +.DS_Store* +ehthumbs.db +Icon? +Thumbs.db + +# Editor Files # +################ +*~ +*.swp + +# Gradle Files # +################ + +# Build output directies +target/ +build/ + + +# Eclipse specific files/directories +.classpath +.project +.settings +.metadata +bin/ + +# NetBeans specific files/directories +.nbattrs diff --git a/src/ca/vanzeben/game/net/GameServer.java b/src/ca/vanzeben/game/net/GameServer.java index 786d7d6..18c07d1 100644 --- a/src/ca/vanzeben/game/net/GameServer.java +++ b/src/ca/vanzeben/game/net/GameServer.java @@ -89,8 +89,8 @@ public void addConnection(PlayerMP player, Packet00Login packet) { // relay to the new player that the currently connect player // exists - packet = new Packet00Login(p.getUsername(), p.x, p.y); - sendData(packet.getData(), player.ipAddress, player.port); + Packet00Login packetCurrentPlayer = new Packet00Login(p.getUsername(), p.x, p.y); + sendData(packetCurrentPlayer.getData(), player.ipAddress, player.port); } } if (!alreadyConnected) {