From 9ecfe703cb5175a0a21fce99804b4fa1b43161f6 Mon Sep 17 00:00:00 2001 From: Seth <13510767+ZeroEpoch1969@users.noreply.github.com> Date: Tue, 28 Jul 2020 14:55:38 -0700 Subject: [PATCH 1/2] Dont have my pc, have to do this from github 1/2 --- .../totalfreedommod/blocking/InteractBlocker.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java index b5f5a410..f33e740b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java @@ -59,16 +59,7 @@ public class InteractBlocker extends FreedomService public void onBedEnter(PlayerBedEnterEvent event) { Player player = event.getPlayer(); - if (event.getBed().getBiome().equals(Biome.NETHER_WASTES) - || event.getBed().getBiome().equals(Biome.CRIMSON_FOREST) - || event.getBed().getBiome().equals(Biome.SOUL_SAND_VALLEY) - || event.getBed().getBiome().equals(Biome.WARPED_FOREST) - || event.getBed().getBiome().equals(Biome.BASALT_DELTAS) - || event.getBed().getBiome().equals(Biome.END_BARRENS) - || event.getBed().getBiome().equals(Biome.END_HIGHLANDS) - || event.getBed().getBiome().equals(Biome.END_MIDLANDS) - || event.getBed().getBiome().equals(Biome.THE_END) - || event.getBed().getBiome().equals(Biome.SMALL_END_ISLANDS)) + if (Groups.EXPLOSIVE_BED_BIOMES.contains(event.getBed().getBiome())) { player.sendMessage(ChatColor.RED + "You may not sleep here."); event.setCancelled(true); From 27f727669802d67783750cb87f2927ef048196e4 Mon Sep 17 00:00:00 2001 From: Seth <13510767+ZeroEpoch1969@users.noreply.github.com> Date: Tue, 28 Jul 2020 14:56:45 -0700 Subject: [PATCH 2/2] Dont have my pc, have to do this from github 2/2 --- .../totalfreedom/totalfreedommod/util/Groups.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/Groups.java b/src/main/java/me/totalfreedom/totalfreedommod/util/Groups.java index 2dc04c9f..bef6a17c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/Groups.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/Groups.java @@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.util; import java.util.Arrays; import java.util.List; import org.bukkit.Material; +import org.bukkit.block.Biome; import org.bukkit.entity.EntityType; public class Groups @@ -207,4 +208,16 @@ public class Groups Material.WHITE_WALL_BANNER, Material.YELLOW_BANNER, Material.YELLOW_WALL_BANNER); -} \ No newline at end of file + + public static final List EXPLOSIVE_BED_BIOMES = Arrays.asList( + Biome.NETHER_WASTES, + Biome.CRIMSON_FOREST, + Biome.SOUL_SAND_VALLEY, + Biome.WARPED_FOREST, + Biome.BASALT_DELTAS, + Biome.END_BARRENS, + Biome.END_HIGHLANDS, + Biome.END_MIDLANDS, + Biome.THE_END, + Biome.SMALL_END_ISLANDS); +}