From e7bfac7bfd93c82c4014b790d033ef215eb2c6f2 Mon Sep 17 00:00:00 2001 From: Driftay Date: Mon, 1 Jul 2019 14:00:29 -0400 Subject: [PATCH] Fixed Point Alias, and Fixed Faction Object Being Registered in TL calling the JsonFaction --- src/main/java/com/massivecraft/factions/Conf.java | 6 ------ src/main/java/com/massivecraft/factions/cmd/CmdPoints.java | 1 - .../java/com/massivecraft/factions/cmd/CmdPointsAdd.java | 2 +- .../java/com/massivecraft/factions/cmd/CmdPointsRemove.java | 2 +- .../java/com/massivecraft/factions/cmd/CmdPointsSet.java | 2 +- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index ef48b96b..7d090084 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -158,19 +158,16 @@ public class Conf { public static boolean territoryEnemyPainBuild = false; public static boolean territoryEnemyPainBuildWhenOffline = false; public static boolean territoryEnemyDenyUseage = true; - public static boolean territoryEnemyProtectMaterials = true; public static boolean territoryAllyDenyBuild = true; public static boolean territoryAllyDenyBuildWhenOffline = true; public static boolean territoryAllyPainBuild = false; public static boolean territoryAllyPainBuildWhenOffline = false; public static boolean territoryAllyDenyUseage = true; - public static boolean territoryAllyProtectMaterials = true; public static boolean territoryTruceDenyBuild = true; public static boolean territoryTruceDenyBuildWhenOffline = true; public static boolean territoryTrucePainBuild = false; public static boolean territoryTrucePainBuildWhenOffline = false; public static boolean territoryTruceDenyUseage = true; - public static boolean territoryTruceProtectMaterials = true; public static boolean territoryBlockCreepers = false; public static boolean territoryBlockCreepersWhenOffline = false; public static boolean territoryBlockFireballs = false; @@ -206,8 +203,6 @@ public class Conf { public static boolean ownedAreaModeratorsBypass = true; public static boolean ownedAreaDenyBuild = true; public static boolean ownedAreaPainBuild = false; - public static boolean ownedAreaProtectMaterials = true; - public static boolean ownedAreaDenyUseage = true; public static boolean ownedMessageOnBorder = true; public static boolean ownedMessageInsideTerritory = true; public static boolean ownedMessageByChunk = false; @@ -332,7 +327,6 @@ public class Conf { public static Set worldsNoWildernessProtection = new LinkedHashSet<>(); // faction- - public static String vaultPrefix = "faction-%s"; public static int defaultMaxVaults = 0; public static boolean useCustomDefaultPermissions = true; public static boolean usePermissionHints = false; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPoints.java b/src/main/java/com/massivecraft/factions/cmd/CmdPoints.java index c0c0ac11..59e17493 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPoints.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPoints.java @@ -12,7 +12,6 @@ public class CmdPoints extends FCommand { public CmdPoints(){ super(); this.aliases.add("points"); - this.aliases.add("point"); this.disableOnLock = false; this.disableOnSpam = false; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPointsAdd.java b/src/main/java/com/massivecraft/factions/cmd/CmdPointsAdd.java index ac236174..548a0cbd 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPointsAdd.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPointsAdd.java @@ -44,7 +44,7 @@ public class CmdPointsAdd extends FCommand { } faction.setPoints(faction.getPoints() + argAsInt(1)); - fme.msg(TL.COMMAND_POINTS_SUCCESSFUL, argAsInt(1), faction, faction.getPoints()); + fme.msg(TL.COMMAND_POINTS_SUCCESSFUL, argAsInt(1), faction.getTag(), faction.getPoints()); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPointsRemove.java b/src/main/java/com/massivecraft/factions/cmd/CmdPointsRemove.java index 3e000e44..d0b457a0 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPointsRemove.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPointsRemove.java @@ -45,7 +45,7 @@ public class CmdPointsRemove extends FCommand { } faction.setPoints(faction.getPoints() - argAsInt(1)); - fme.msg(TL.COMMAND_REMOVEPOINTS_SUCCESSFUL, argAsInt(1), faction, faction.getPoints()); + fme.msg(TL.COMMAND_REMOVEPOINTS_SUCCESSFUL, argAsInt(1), faction.getTag(), faction.getPoints()); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPointsSet.java b/src/main/java/com/massivecraft/factions/cmd/CmdPointsSet.java index 405ecb6e..249ec081 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPointsSet.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPointsSet.java @@ -45,7 +45,7 @@ public class CmdPointsSet extends FCommand{ } faction.setPoints(faction.getPoints() - argAsInt(1)); - fme.msg(TL.COMMAND_SETPOINTS_SUCCESSFUL, argAsInt(1), faction, faction.getPoints()); + fme.msg(TL.COMMAND_SETPOINTS_SUCCESSFUL, argAsInt(1), faction.getTag(), faction.getPoints()); }