diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PlayerJoinListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PlayerJoinListener.java
new file mode 100644
index 00000000..20d70784
--- /dev/null
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PlayerJoinListener.java
@@ -0,0 +1,29 @@
+package de.steamwar.fightsystem.listener;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+public class PlayerJoinListener implements Listener {
+
+    @EventHandler()
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+
+        Location loc = player.getLocation();
+        int viewDistance = Bukkit.getViewDistance();
+
+        int chunkX = loc.getChunk().getX();
+        int chunkZ = loc.getChunk().getZ();
+
+        // Iterate through the chunks around the player and force a resend
+        for (int x = -viewDistance; x <= viewDistance; x++) {
+            for (int z = -viewDistance; z <= viewDistance; z++) {
+                player.getWorld().refreshChunk(chunkX + x, chunkZ + z);
+            }
+        }
+    }
+}