diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/world/TestRegion.java b/BauSystem_Main/src/de/steamwar/bausystem/features/world/TestRegion.java new file mode 100644 index 00000000..ce30221a --- /dev/null +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/world/TestRegion.java @@ -0,0 +1,38 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.bausystem.features.world; + +import de.steamwar.bausystem.SWUtils; +import de.steamwar.bausystem.linkage.LinkageType; +import de.steamwar.bausystem.linkage.Linked; +import de.steamwar.bausystem.region.Region; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerMoveEvent; + +@Linked(LinkageType.LISTENER) +public class TestRegion implements Listener { + + @EventHandler + public void onPlayerMove(PlayerMoveEvent event) { + SWUtils.sendToActionbar(event.getPlayer(), Region.getRegion(event.getTo()).getDisplayName()); + } + +} diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java index ff0f20da..32616786 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java @@ -95,6 +95,9 @@ public class Region { } public boolean inRegion(Location location, RegionType regionType, RegionExtensionType regionExtensionType) { + if (!hasType(regionType)) { + return false; + } switch (regionType) { case BUILD: Point minBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? minPointBuildExtension : minPointBuild; @@ -128,4 +131,8 @@ public class Region { } } + public String getDisplayName() { + return prototype != null ? prototype.getDisplayName() : ""; + } + }