Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing one typo and a minor bug.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-24 16:50:19 +02:00
parent 0992c403b5
commit 80eb506499
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/entity/BoardColls.java
View File

@ -46,7 +46,7 @@ public class BoardColls extends XColls<BoardColl, Board> implements BoardInterfa
@Override @Override
public String getBasename() public String getBasename()
{ {
return Const.COLLECTION_BASENAME_UCONF; return Const.COLLECTION_BASENAME_BOARD;
} }
@Override @Override

3
src/com/massivecraft/factions/entity/MConf.java
View File

@ -7,6 +7,7 @@ import java.util.Set;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.listeners.FactionsListenerChat; import com.massivecraft.factions.listeners.FactionsListenerChat;
import com.massivecraft.mcore.store.Entity; import com.massivecraft.mcore.store.Entity;
@ -28,6 +29,8 @@ public class MConf extends Entity<MConf>
{ {
super.load(that); super.load(that);
if (!Factions.get().isDatabaseInitialized()) return this;
FactionsListenerChat.get().setup(); FactionsListenerChat.get().setup();
return this; return this;

2
src/com/massivecraft/factions/entity/UConf.java
View File

@ -36,7 +36,7 @@ public class UConf extends Entity<UConf>
// DEFAULTS // DEFAULTS
// -------------------------------------------- // // -------------------------------------------- //
public String defaultPlayerFactionId = factionIdNone; public String defaultPlayerFactionId = this.factionIdNone;
public Rel defaultPlayerRole = Rel.RECRUIT; public Rel defaultPlayerRole = Rel.RECRUIT;
public double defaultPlayerPower = 0.0; public double defaultPlayerPower = 0.0;