From 7d8f08f438d7546785428c1e3159440482fa57d2 Mon Sep 17 00:00:00 2001 From: Iaiao Date: Mon, 11 Jan 2021 12:00:39 +0200 Subject: [PATCH 1/2] Add teleportOnJoin and teleportOnDeath to config.yml --- .../java/com/herocc/bukkit/multispawn/events/PlayerDeath.java | 3 ++- .../java/com/herocc/bukkit/multispawn/events/PlayerJoin.java | 1 + src/main/resources/config.yml | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java index 2bbefd6..6d3ad98 100644 --- a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java +++ b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java @@ -14,7 +14,8 @@ public class PlayerDeath implements Listener { public void onPlayerDeath(PlayerDeathEvent ev) { final Player p = ev.getEntity(); if (p.hasPermission("multispawn.noteleport") // If player is excluded - || plugin.getSpawnUtils().getSpawns(p, false).isEmpty()) return; // If spawns are empty + || !plugin.getConfig().getBoolean("teleportOnDeath") + || plugin.getSpawnUtils().getSpawns(p, false).isEmpty()) return; // If spawns are empty if (plugin.getSpawnUtils().getSpawns(p, true).size() == 1 && plugin.getSpawnUtils().getSpawns(p, true).contains("default") diff --git a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java index ea7226c..c7deeb6 100644 --- a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java +++ b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java @@ -16,6 +16,7 @@ public class PlayerJoin implements Listener { public void onPlayerJoin(PlayerJoinEvent ev) { final Player p = ev.getPlayer(); if (p.hasPermission("multispawn.noteleport") // If player is excluded + || !plugin.getConfig().getBoolean("teleportOnJoin") || plugin.getSpawnUtils().getSpawns(p, false).isEmpty()) return; // If spawns are empty if (plugin.getSpawnUtils().getSpawns(p, true).size() == 1 diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 874e910..3e53316 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,3 +1,6 @@ spawns: [] useDefaultAsFallback: true # If the player has no permissions, use the spawn named 'default' configversion: 1 + +teleportOnJoin: true +teleportOnDeath: false From a38cb8416180ad86bf9f135b764d97804db5aa70 Mon Sep 17 00:00:00 2001 From: Iaiao Date: Mon, 11 Jan 2021 12:08:56 +0200 Subject: [PATCH 2/2] Add comments to 'disabled in config' condition --- .../java/com/herocc/bukkit/multispawn/events/PlayerDeath.java | 2 +- .../java/com/herocc/bukkit/multispawn/events/PlayerJoin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java index 6d3ad98..9853871 100644 --- a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java +++ b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerDeath.java @@ -14,7 +14,7 @@ public class PlayerDeath implements Listener { public void onPlayerDeath(PlayerDeathEvent ev) { final Player p = ev.getEntity(); if (p.hasPermission("multispawn.noteleport") // If player is excluded - || !plugin.getConfig().getBoolean("teleportOnDeath") + || !plugin.getConfig().getBoolean("teleportOnDeath") // If disabled in config.yml || plugin.getSpawnUtils().getSpawns(p, false).isEmpty()) return; // If spawns are empty if (plugin.getSpawnUtils().getSpawns(p, true).size() == 1 diff --git a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java index c7deeb6..3737afb 100644 --- a/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java +++ b/src/main/java/com/herocc/bukkit/multispawn/events/PlayerJoin.java @@ -16,7 +16,7 @@ public class PlayerJoin implements Listener { public void onPlayerJoin(PlayerJoinEvent ev) { final Player p = ev.getPlayer(); if (p.hasPermission("multispawn.noteleport") // If player is excluded - || !plugin.getConfig().getBoolean("teleportOnJoin") + || !plugin.getConfig().getBoolean("teleportOnJoin") // If disabled in config.yml || plugin.getSpawnUtils().getSpawns(p, false).isEmpty()) return; // If spawns are empty if (plugin.getSpawnUtils().getSpawns(p, true).size() == 1