Add spawn.schematic and avoid void damage in spawn

rlf · Jul 14, 2018 · 3433e07 · 3433e07
1 parent 1af3736
commit 3433e07
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
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
@@ -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