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

MassiveCore - Object Titles and Mixed Messages

Browse Source
This commit is contained in:
Olof Larsson
2016-03-15 20:43:54 +01:00
parent 7c131f270b
commit f03733f488
12 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/engine/EngineMain.java
View File

@@ -384,7 +384,7 @@ public class EngineMain extends Engine
if (!Mixin.isActualJoin(event)) return;
// ... then prepare the messages ...
final List<String> messages = faction.getMotdMessages();
final List<Object> messages = faction.getMotdMessages();
// ... and send to the player.
if (MConf.get().motdDelayTicks < 0)
@@ -669,7 +669,7 @@ public class EngineMain extends Engine
// send host faction info updates
if (mplayer.isMapAutoUpdating())
{
List<String> message = BoardColl.get().getMap(mplayer, chunkTo, player.getLocation().getYaw(), Const.MAP_WIDTH, Const.MAP_HEIGHT);
List<Object> message = BoardColl.get().getMap(mplayer, chunkTo, player.getLocation().getYaw(), Const.MAP_WIDTH, Const.MAP_HEIGHT);
mplayer.message(message);
}
else if (factionFrom != factionTo)