EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actions based on text search for the word universe.

Browse Source
This commit is contained in:
Olof Larsson
2014-09-17 13:33:09 +02:00
parent 0b60a5ad1a
commit 5e812e1b9b
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/TerritoryAccess.java
View File

@@ -91,7 +91,7 @@ public class TerritoryAccess
} }
// -------------------------------------------- // // -------------------------------------------- //
// FIELDS: UNIVERSED // FIELDS: DIRECT
// -------------------------------------------- // // -------------------------------------------- //
public Faction getHostFaction() public Faction getHostFaction()

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java
View File

@@ -57,7 +57,7 @@ public class CmdFactionsFaction extends FCommand
boolean normal = faction.isNormal(); boolean normal = faction.isNormal();
// INFO: Title // INFO: Title
msg(Txt.titleize(Txt.upperCaseFirst(faction.getUniverse()) + " Faction " + faction.getName(usender))); msg(Txt.titleize("Faction " + faction.getName(usender)));
// INFO: Description // INFO: Description
msg("<a>Description: <i>%s", faction.getDescription()); msg("<a>Description: <i>%s", faction.getDescription());

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java
View File

@@ -41,7 +41,7 @@ public class CmdFactionsPlayer extends FCommand
if (mplayer == null) return; if (mplayer == null) return;
// INFO: Title // 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) // INFO: Power (as progress bar)
double progressbarQuota = mplayer.getPower() / mplayer.getPowerMax(); double progressbarQuota = mplayer.getPower() / mplayer.getPowerMax();

6
src/main/java/com/massivecraft/factions/entity/Faction.java
View File

@@ -102,7 +102,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
// Can anyone join the Faction? // Can anyone join the Faction?
// If the faction is open they can. // If the faction is open they can.
// If the faction is closed an invite is required. // If the faction is closed an invite is required.
// Null means default for the universe. // Null means default.
private Boolean open = null; private Boolean open = null;
// This is the ids of the invited players. // This is the ids of the invited players.
@@ -115,11 +115,11 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
private Map<String, Rel> relationWishes = null; private Map<String, Rel> relationWishes = null;
// The flag overrides are modifications to the default values. // The flag overrides are modifications to the default values.
// Null means default for the universe. // Null means default.
private Map<FFlag, Boolean> flags = null; private Map<FFlag, Boolean> flags = null;
// The perm overrides are modifications to the default values. // The perm overrides are modifications to the default values.
// Null means default for the universe. // Null means default.
private Map<FPerm, Set<Rel>> perms = null; private Map<FPerm, Set<Rel>> perms = null;
// -------------------------------------------- // // -------------------------------------------- //

6
src/main/java/com/massivecraft/factions/entity/MPlayer.java
View File

@@ -103,11 +103,11 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
// This is a foreign key. // This is a foreign key.
// Each player belong to a faction. // Each player belong to a faction.
// Null means default for the universe. // Null means default.
private String factionId = null; private String factionId = null;
// What role does the player have in the faction? // What role does the player have in the faction?
// Null means default for the universe. // Null means default.
private Rel role = null; private Rel role = null;
// What title does the player have in the faction? // What title does the player have in the faction?
@@ -129,7 +129,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
// Each player has an individual power level. // 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. // 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. // 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; private Double power = null;
// Has this player requested an auto-updating ascii art map? // Has this player requested an auto-updating ascii art map?

3
src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
View File

@@ -29,7 +29,6 @@ public class MPlayerColl extends SenderColl<MPlayer>
public void clean() public void clean()
{ {
String universe = this.getUniverse();
for (MPlayer mplayer : this.getAll()) for (MPlayer mplayer : this.getAll())
{ {
String factionId = mplayer.getFactionId(); String factionId = mplayer.getFactionId();
@@ -37,7 +36,7 @@ public class MPlayerColl extends SenderColl<MPlayer>
mplayer.resetFactionData(); mplayer.resetFactionData();
String message = Txt.parse("<i>Reset data for <h>%s <i>in <h>%s <i>universe. Unknown factionId <h>%s", mplayer.getDisplayName(IdUtil.getConsole()), universe, factionId); String message = Txt.parse("<i>Reset data for <h>%s <i>. Unknown factionId <h>%s", mplayer.getDisplayName(IdUtil.getConsole()), factionId);
Factions.get().log(message); Factions.get().log(message);
} }
} }