diff --git a/src/main/java/rip/iwakura/civilcore/Court.java b/src/main/java/rip/iwakura/civilcore/Court.java index 30fd160..b2a7fc2 100644 --- a/src/main/java/rip/iwakura/civilcore/Court.java +++ b/src/main/java/rip/iwakura/civilcore/Court.java @@ -13,12 +13,29 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockSpreadEvent; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; public class Court implements Listener,CommandExecutor{ private World court_world = Bukkit.getWorld("court"); private Location court_location = new Location(court_world, 4.5, 70.0, 0.5, -90f, 1.0f); + @EventHandler + public void PlayerHurt(EntityDamageEvent e) { + if (!(e.getEntity() instanceof Player)) return; + Player p = (Player) e.getEntity(); + + if (!p.getLocation().getWorld().getName().equals("court")) return; + + e.setCancelled(true); + + if (e.getCause() == DamageCause.VOID) { + p.teleport(court_location); + return; + } + } + @EventHandler public void PlayerBreak(BlockBreakEvent e) { if (e.getPlayer().isOp()) return; diff --git a/src/main/java/rip/iwakura/civilcore/discord/Discord.java b/src/main/java/rip/iwakura/civilcore/discord/Discord.java index 85c9fb2..49f1384 100644 --- a/src/main/java/rip/iwakura/civilcore/discord/Discord.java +++ b/src/main/java/rip/iwakura/civilcore/discord/Discord.java @@ -58,8 +58,8 @@ public class Discord extends ListenerAdapter { public void onReady(ReadyEvent e) { this.channel = bot.getTextChannelById(channelId); String webhook_token = civilCore.getConfig().getString("discord.webhook.token"); - Long webhook_id = Long.parseLong(civilCore.getConfig().getString("discord.webhook.id")); if (webhook_token != null) { + Long webhook_id = Long.parseLong(civilCore.getConfig().getString("discord.webhook.id")); this.webhook = new WebhookClientBuilder(webhook_id, webhook_token).build(); } else { channel.createWebhook("CivilBot").queue((hook) -> {