From 5e812e1b9b194eab00d33f971704ca50ca788d22 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 17 Sep 2014 13:33:09 +0200 Subject: [PATCH] Actions based on text search for the word universe. --- .../java/com/massivecraft/factions/TerritoryAccess.java | 2 +- .../com/massivecraft/factions/cmd/CmdFactionsFaction.java | 2 +- .../com/massivecraft/factions/cmd/CmdFactionsPlayer.java | 2 +- src/main/java/com/massivecraft/factions/entity/Faction.java | 6 +++--- src/main/java/com/massivecraft/factions/entity/MPlayer.java | 6 +++--- .../java/com/massivecraft/factions/entity/MPlayerColl.java | 3 +-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/TerritoryAccess.java b/src/main/java/com/massivecraft/factions/TerritoryAccess.java index b9a4cbd2..7b3f3139 100644 --- a/src/main/java/com/massivecraft/factions/TerritoryAccess.java +++ b/src/main/java/com/massivecraft/factions/TerritoryAccess.java @@ -91,7 +91,7 @@ public class TerritoryAccess } // -------------------------------------------- // - // FIELDS: UNIVERSED + // FIELDS: DIRECT // -------------------------------------------- // public Faction getHostFaction() diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java index 16a8809a..4bcddf87 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java @@ -57,7 +57,7 @@ public class CmdFactionsFaction extends FCommand boolean normal = faction.isNormal(); // INFO: Title - msg(Txt.titleize(Txt.upperCaseFirst(faction.getUniverse()) + " Faction " + faction.getName(usender))); + msg(Txt.titleize("Faction " + faction.getName(usender))); // INFO: Description msg("Description: %s", faction.getDescription()); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java index f4fa28e0..5be23f6c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java @@ -41,7 +41,7 @@ public class CmdFactionsPlayer extends FCommand if (mplayer == null) return; // INFO: Title - msg(Txt.titleize(Txt.upperCaseFirst(mplayer.getUniverse()) + " Player " + mplayer.describeTo(usender))); + msg(Txt.titleize("Player " + mplayer.describeTo(usender))); // INFO: Power (as progress bar) double progressbarQuota = mplayer.getPower() / mplayer.getPowerMax(); diff --git a/src/main/java/com/massivecraft/factions/entity/Faction.java b/src/main/java/com/massivecraft/factions/entity/Faction.java index d13b2815..57b69cbc 100644 --- a/src/main/java/com/massivecraft/factions/entity/Faction.java +++ b/src/main/java/com/massivecraft/factions/entity/Faction.java @@ -102,7 +102,7 @@ public class Faction extends Entity implements EconomyParticipator // Can anyone join the Faction? // If the faction is open they can. // If the faction is closed an invite is required. - // Null means default for the universe. + // Null means default. private Boolean open = null; // This is the ids of the invited players. @@ -115,11 +115,11 @@ public class Faction extends Entity implements EconomyParticipator private Map relationWishes = null; // The flag overrides are modifications to the default values. - // Null means default for the universe. + // Null means default. private Map flags = null; // The perm overrides are modifications to the default values. - // Null means default for the universe. + // Null means default. private Map> perms = null; // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayer.java b/src/main/java/com/massivecraft/factions/entity/MPlayer.java index 629fcd2b..fb483891 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPlayer.java +++ b/src/main/java/com/massivecraft/factions/entity/MPlayer.java @@ -103,11 +103,11 @@ public class MPlayer extends SenderEntity implements EconomyParticipato // This is a foreign key. // Each player belong to a faction. - // Null means default for the universe. + // Null means default. private String factionId = null; // What role does the player have in the faction? - // Null means default for the universe. + // Null means default. private Rel role = null; // What title does the player have in the faction? @@ -129,7 +129,7 @@ public class MPlayer extends SenderEntity implements EconomyParticipato // Each player has an individual power level. // The power level for online players is occasionally updated by a recurring task and the power should stay the same for offline players. // For that reason the value is to be considered correct when you pick it. Do not call the power update method. - // Null means default for the universe. + // Null means default. private Double power = null; // Has this player requested an auto-updating ascii art map? diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java index f06289b2..a9a6906e 100644 --- a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java +++ b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java @@ -29,7 +29,6 @@ public class MPlayerColl extends SenderColl public void clean() { - String universe = this.getUniverse(); for (MPlayer mplayer : this.getAll()) { String factionId = mplayer.getFactionId(); @@ -37,7 +36,7 @@ public class MPlayerColl extends SenderColl mplayer.resetFactionData(); - String message = Txt.parse("Reset data for %s in %s universe. Unknown factionId %s", mplayer.getDisplayName(IdUtil.getConsole()), universe, factionId); + String message = Txt.parse("Reset data for %s . Unknown factionId %s", mplayer.getDisplayName(IdUtil.getConsole()), factionId); Factions.get().log(message); } }