JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QA Fixes

Browse Source
This commit is contained in:
samczsun 2016-12-15 22:39:07 -05:00 committed by cnr
parent 58761a0478
commit a6db0170c6
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/titles/Titles.java
View File

@ -264,7 +264,7 @@ public class Titles extends MiniDbClientPlugin<TitleData> implements IPacketHand
private void giveBook18(Player player, boolean open)
{
ItemStack book = new ItemBuilder(Material.BOOK)
.setTitle(ChatColor.GREEN + "Titles " + ChatColor.WHITE + "- " + ChatColor.RED + "Disabled")
.setTitle(ChatColor.GREEN + "Titles " + ChatColor.WHITE + "- " + ChatColor.RED + "Unavailable")
.setLore(
ChatColor.RESET + "" + ChatColor.GRAY + "by Mineplex Games",
ChatColor.RESET + "" + ChatColor.GRAY + "Original",

6
Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/HolidayCheerTrack.java
View File

@ -100,9 +100,9 @@ public class HolidayCheerTrack extends Track
.withRequirement(5, "game played in Holiday Games")
.withRequirement(25, "win in Holiday Games");
Map<Integer, String> points = new HashMap<>();
POINTS.forEach((clazz, value) -> points.merge(value, _gadgetManager.getGadget(clazz).getName(), (a, b) -> a + "/" + b));
points.forEach((value, type) -> getRequirements().withRequirement(value, type));
getRequirements()
.withRequirement(POINTS.get(ItemLovePotion.class), _gadgetManager.getGadget(ItemLovePotion.class).getName())
.withRequirement(1, "Holiday Gadget");
HOLIDAY_SETS.forEach(clazz -> getRequirements().withSetBonus(clazz, 2));
}

1
Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/TreasureHunterTrack.java
View File

@ -25,6 +25,7 @@ public class TreasureHunterTrack extends Track
POINTS.put(TreasureType.CHRISTMAS, 25);
POINTS.put(TreasureType.TRICK_OR_TREAT, 25);
POINTS.put(TreasureType.THANKFUL, 25);
POINTS.put(TreasureType.GINGERBREAD, 25);
POINTS.put(TreasureType.OMEGA, 50);
}

18
Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java
View File

@ -9,10 +9,12 @@ import java.util.Properties;
import mineplex.core.updater.command.BuildVersionCommand;
import mineplex.core.updater.command.RestartServerCommand;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.event.server.ServerListPingEvent;
import org.bukkit.plugin.java.JavaPlugin;
@ -65,6 +67,22 @@ public class FileUpdater extends MiniPlugin
addCommand(new RestartServerCommand(this));
addCommand(new BuildVersionCommand(this));
}
@EventHandler
public void onServerCommand(ServerCommandEvent event)
{
if (event.getCommand().startsWith("updatekickall "))
{
String[] args = event.getCommand().split(" ");
String message = StringUtils.join(args, " ", 1, args.length);
for (Player player : Bukkit.getOnlinePlayers())
{
player.sendMessage(F.main("Updater", message));
_portal.sendPlayerToServer(player, "Lobby");
}
}
}
@EventHandler
public void tryToRestart(UpdateEvent event)