forked from SteamWar/SteamWar
Fix some more errors
This commit is contained in:
+1
-6
@@ -57,12 +57,7 @@ public class BauInfoBauGuiItem extends BauGuiItem {
|
|||||||
Region region = Region.getRegion(player.getLocation());
|
Region region = Region.getRegion(player.getLocation());
|
||||||
List<String> stringList = new ArrayList<>();
|
List<String> stringList = new ArrayList<>();
|
||||||
for (Flag flag : Flag.getFlags()) {
|
for (Flag flag : Flag.getFlags()) {
|
||||||
if (flag == Flag.PROTECT && region.getFloorLevel() == 0) {
|
if (!region.getFlags().has(flag).isApplicable()) continue;
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (flag == Flag.ITEMS && Core.getVersion() < 19) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
FlagOptional<?> value = region.getFlags().get(flag);
|
FlagOptional<?> value = region.getFlags().get(flag);
|
||||||
if (value.isPresent()) {
|
if (value.isPresent()) {
|
||||||
stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), player)));
|
stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), player)));
|
||||||
|
|||||||
@@ -31,9 +31,7 @@ public class InfoCommand extends SWCommand {
|
|||||||
BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName());
|
BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName());
|
||||||
Region region = Region.getRegion(p.getLocation());
|
Region region = Region.getRegion(p.getLocation());
|
||||||
for (Flag flag : Flag.getFlags()) {
|
for (Flag flag : Flag.getFlags()) {
|
||||||
if (flag == Flag.PROTECT && region.getFloorLevel() == 0) {
|
if (!region.getFlags().has(flag).isApplicable()) continue;
|
||||||
continue;
|
|
||||||
}
|
|
||||||
FlagOptional<?> value = region.getFlags().get(flag);
|
FlagOptional<?> value = region.getFlags().get(flag);
|
||||||
if (value.isPresent()) {
|
if (value.isPresent()) {
|
||||||
BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), p));
|
BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), p));
|
||||||
|
|||||||
Reference in New Issue
Block a user