diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/DamageListener.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/DamageListener.java
new file mode 100644
index 000000000..f526853ed
--- /dev/null
+++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Listeners/DamageListener.java	
@@ -0,0 +1,28 @@
+package me.Josvth.RandomSpawn.Listeners;
+
+import me.Josvth.RandomSpawn.RandomSpawn;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+
+public class DamageListener implements Listener{
+	
+	RandomSpawn plugin;
+	
+	public DamageListener(RandomSpawn instance){
+		plugin = instance;
+		plugin.getServer().getPluginManager().registerEvents(this, plugin);
+	}
+	
+	@EventHandler
+	public void onDamage(EntityDamageEvent event){
+		if(event.getEntity() instanceof Player && event.getEntity().hasMetadata("lasttimerandomspawned") && !event.getCause().equals(DamageCause.SUICIDE)){
+			if((event.getEntity().getMetadata("lasttimerandomspawned").get(0).asLong() + (plugin.yamlHandler.config.getInt("nodamagetime",5)*1000)) > System.currentTimeMillis()){
+				event.setCancelled(true);
+			}
+		}
+	}
+}