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

Fix getters for motd and description

Browse Source
This commit is contained in:
Magnus Ulf Jørgensen
2017-05-09 10:59:38 +02:00
parent 25a54882c9
commit 4dba9140de
5 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/massivecraft/factions/entity/Faction.java
View File

@ -237,8 +237,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
public String getDescription()
{
if (this.hasDescription()) return this.description;
return NODESCRIPTION;
return this.description;
}
public void setDescription(String description)
@ -256,6 +255,15 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
this.changed();
}
// FINER
public String getDescriptionDesc()
{
String motd = this.getDescription();
if (motd == null) motd = NODESCRIPTION;
return motd;
}
// -------------------------------------------- //
// FIELD: motd
// -------------------------------------------- //
@ -269,8 +277,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
public String getMotd()
{
if (this.hasMotd()) return this.motd;
return NOMOTD;
return this.motd;
}
public void setMotd(String motd)
@ -290,6 +297,17 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
// FINER
public String getMotdDesc()
{
return getMotdDesc(this.getMotd());
}
private static String getMotdDesc(String motd)
{
if (motd == null) motd = NOMOTD;
return motd;
}
public List<Object> getMotdMessages()
{
// Create
@ -300,7 +318,7 @@ public class Faction extends Entity<Faction> implements FactionsParticipator
title = Txt.titleize(title);
ret.add(title);
String motd = Txt.parse("<i>" + this.getMotd());
String motd = Txt.parse("<i>") + this.getMotdDesc();
ret.add(motd);
ret.add("");