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

Fix issues QA found

Browse Source
This commit is contained in:
Sam 2018-03-31 03:24:57 +01:00 committed by Alexander Meech
parent d2053ff4b7
commit b1b31f1135
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMaryPoppins.java
View File

@ -1,6 +1,8 @@
package mineplex.core.gadget.gadgets.item; package mineplex.core.gadget.gadgets.item;
import java.awt.*; import java.awt.*;
import java.time.Month;
import java.time.YearMonth;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.bukkit.Location; import org.bukkit.Location;
@ -42,6 +44,7 @@ public class ItemMaryPoppins extends ItemGadget
}, CostConstants.POWERPLAY_BONUS, Material.STICK, (byte) 0, TimeUnit.SECONDS.toMillis(20), null); }, CostConstants.POWERPLAY_BONUS, Material.STICK, (byte) 0, TimeUnit.SECONDS.toMillis(20), null);
Free = false; Free = false;
setPPCYearMonth(YearMonth.of(2018, Month.APRIL));
} }
@Override @Override

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/worldmap/WorldMapModule.java
View File

@ -39,6 +39,7 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilInv;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
import mineplex.core.itemstack.ItemBuilder; import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
@ -189,6 +190,11 @@ public class WorldMapModule extends Module
{ {
getGame().registerDebugCommand("map", Perm.MAP_COMMAND, PermissionGroup.PLAYER, (player, args) -> getGame().registerDebugCommand("map", Perm.MAP_COMMAND, PermissionGroup.PLAYER, (player, args) ->
{ {
if (UtilPlayer.isSpectator(player))
{
return;
}
Inventory inventory = player.getInventory(); Inventory inventory = player.getInventory();
inventory.remove(Material.MAP); inventory.remove(Material.MAP);
inventory.addItem(getMapItem()); inventory.addItem(getMapItem());

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorsePet.java
View File

@ -57,7 +57,7 @@ public class PerkHorsePet extends Perk
{ {
if (Manager.GetGame().InProgress()) if (Manager.GetGame().InProgress())
{ {
Manager.runSyncLater(() -> spawnHorse(player, false), 45 * 20); Manager.runSyncLater(() -> spawnHorse(player, false), 35 * 20);
} }
} }