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

Merge branch 'develop' into update/kingppc

Browse Source
This commit is contained in:
LCastr0 2017-05-02 00:09:19 -03:00
commit 923f991df3
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/king/CastleManager.java
View File

@ -355,6 +355,10 @@ public class CastleManager extends MiniPlugin
*/
private void updateHologram()
{
if (!isHub())
{
return;
}
if (_hologram != null)
{
_hologram.stop();

1
Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java
View File

@ -37,6 +37,7 @@ public class PowerPlayClubRewards
.put(YearMonth.of(2017, Month.FEBRUARY), new PetItem(PetType.TRUE_LOVE_PET))
.put(YearMonth.of(2017, Month.MARCH), new UnknownSalesPackageItem("Gold Pot Morph"))
.put(YearMonth.of(2017, Month.APRIL), new UnknownSalesPackageItem("Bumblebee's Wings"))
.put(YearMonth.of(2017, Month.MAY), new UnknownSalesPackageItem("King"))
.build();
public interface PowerPlayClubItem

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

@ -296,7 +296,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed
public long PrepareTime = 9000;
public boolean PlaySoundGameStart = true;
public double XpMult = 2;
public double XpMult = 1;
public boolean SpeedMeasurement = false;