From d25b39058adb791e5f45741717cbba13ca803278 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Fri, 3 Apr 2015 04:19:48 -0700 Subject: [PATCH 1/3] Fixed bunny morph name. --- .../staffServer/salespackage/salespackages/EasterBunny.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/EasterBunny.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/EasterBunny.java index 4b7681480..6aacf8014 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/EasterBunny.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/salespackages/EasterBunny.java @@ -13,7 +13,7 @@ public class EasterBunny extends SalesPackageBase public void displayToAgent(Player agent, String playerName) { - addButton(agent, "/sales item " + playerName + " 1 Easter Bunny Morph", "Give Easter Bunny Morph."); + addButton(agent, "/sales item " + playerName + " 1 Morph Easter Bunny Morph", "Give Easter Bunny Morph."); agent.sendMessage(" "); addBackButton(agent, playerName); } From 4eb1f67d822dd180a50d7f93d07bc661cdb2817b Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Mon, 6 Apr 2015 04:13:13 -0700 Subject: [PATCH 2/3] Removed code to set default motd. --- .../src/mineplex/bungee/motd/MotdManager.java | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java index 56a2f0662..1ee1475a5 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java @@ -54,6 +54,7 @@ public class MotdManager implements Listener, Runnable, CustomMotdFactory public void run() { // Add in default MOTD listing to database + /* if (!_repository.elementExists("MainMotd")) { _repository.removeElement("MainMotd"); @@ -66,25 +67,17 @@ public class MotdManager implements Listener, Runnable, CustomMotdFactory lines.add(" §d§lHero Sale §a§l33% Off"); lines.add(" §a§lDouble Gems for 1.8 Players!"); - /* - lines.add("§a§l MOO"); - lines.add("§a§l MOO"); - lines.add("§a§l MOO"); - lines.add("§a§l MOO"); - lines.add("§a§l MOO"); - lines.add("§a§l MOO"); - lines.add("§a§l MOO"); - lines.add("§a§l MOO"); - lines.add("§a§l MOO"); - */ - updateMainMotd(" §b§l§m §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§b§l§m §r", lines); - //updateMainMotd(" §b§l§m §8§l§m[ §r §9§lMooplex§r §f§lGames§r §8§l§m ]§b§l§m §r", lines); } + */ GlobalMotd motd = _repository.getElement("MainMotd"); - _motdLines = motd.getMotd(); - _firstLine = motd.getHeadline(); + + if (motd != null) + { + _motdLines = motd.getMotd(); + _firstLine = motd.getHeadline(); + } InitialHandler.setCustomMotdFactory(this); } From 679d5faa9b1fdab1954d003104a843c5851febc1 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Mon, 6 Apr 2015 04:14:04 -0700 Subject: [PATCH 3/3] Motd pull on start. --- .../src/mineplex/bungee/motd/MotdManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java index 1ee1475a5..358e1d3b2 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java @@ -34,6 +34,7 @@ public class MotdManager implements Listener, Runnable, CustomMotdFactory _repository = new RedisDataRepository(ServerManager.getMasterConnection(), ServerManager.getSlaveConnection(), Region.ALL, GlobalMotd.class, "globalMotd"); + run(); } @EventHandler