From 3433e074405d5bb8ceb4502f748d8e91a66b07c6 Mon Sep 17 00:00:00 2001
From: rlf <rasmus@lockfuglsang.dk>
Date: Sat, 14 Jul 2018 14:18:43 +0200
Subject: [PATCH] Add spawn.schematic and avoid void damage in spawn

---
 .../ultimateskyblock/event/PlayerEvents.java     |  12 ++++++++++++
 .../main/resources/schematics/spawn.schematic    | Bin 0 -> 2270 bytes
 2 files changed, 12 insertions(+)
 create mode 100644 uSkyBlock-Core/src/main/resources/schematics/spawn.schematic

diff --git a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/event/PlayerEvents.java b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/event/PlayerEvents.java
index 633e69205..dbd24bd5c 100644
--- a/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/event/PlayerEvents.java
+++ b/uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/event/PlayerEvents.java
@@ -188,6 +188,18 @@ public void onVisitorDamage(final EntityDamageEvent event) {
         }
     }
 
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onSpawnDamage(final EntityDamageEvent event) {
+        if (!plugin.isSkyWorld(event.getEntity().getWorld())) {
+            return;
+        }
+        if (event.getEntity() instanceof Player && plugin.playerIsInSpawn((Player) event.getEntity()) && event.getCause() == EntityDamageEvent.DamageCause.VOID) {
+            event.setDamage(-event.getDamage());
+            event.setCancelled(true);
+            plugin.spawnTeleport((Player) event.getEntity(), true);
+        }
+    }
+
     @EventHandler
     public void onMemberDamage(final EntityDamageByEntityEvent event) {
         if (!plugin.isSkyWorld(event.getEntity().getWorld())) {
diff --git a/uSkyBlock-Core/src/main/resources/schematics/spawn.schematic b/uSkyBlock-Core/src/main/resources/schematics/spawn.schematic
new file mode 100644
index 0000000000000000000000000000000000000000..05ea3316e3a93e14e30e114687db62004e02f12e
GIT binary patch
literal 2270
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

literal 0
HcmV?d00001