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

Fix some last minute things

Browse Source
This commit is contained in:
Sam 2018-09-15 16:20:41 +01:00 committed by Alexander Meech
parent 984a86acab
commit 6edc1d7560
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/cycle/GameCycle.java
View File

@ -110,7 +110,7 @@ public class GameCycle extends GameManager
cancel();
}
}
}, 20, 10);
}, 10, 10);
}
}

10
Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/components/currency/GameCurrencyManager.java
View File

@ -98,6 +98,11 @@ public class GameCurrencyManager extends GameManager implements CurrencyComponen
if (data != null)
{
data.Games++;
if (data.Games == 100)
{
event.getGame().addStat(player, "PlayInARow", 1, true, false);
}
}
}
}
@ -196,11 +201,6 @@ public class GameCurrencyManager extends GameManager implements CurrencyComponen
statsManager.incrementStat(player, gameName + ".ExpEarned", exp);
statsManager.incrementStat(player, "Global.GamesPlayed", gamesPlayed);
require(TrackManager.class).getTrack(GemCollectorTrack.class).earnedGems(player, gems);
if (data.Games >= 100)
{
statsManager.incrementStat(player, gameName + ".PlayInARow", 1);
}
}
// Remove from session

12
Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/components/player/GamePlayerManager.java
View File

@ -19,6 +19,7 @@ import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.gadget.event.GadgetEnableEvent;
import mineplex.core.gadget.persistence.UserGadgetPersistence;
import mineplex.core.pet.event.PetSpawnEvent;
import mineplex.core.teleport.event.MineplexTeleportEvent;
import mineplex.game.nano.GameManager;
import mineplex.game.nano.game.Game.GameState;
@ -190,6 +191,17 @@ public class GamePlayerManager extends GameManager implements ComponentHook<Game
}
}
@EventHandler
public void petSpawn(PetSpawnEvent event)
{
if (_hook == null)
{
return;
}
event.setCancelled(true);
}
@EventHandler
public void vehicleEnter(VehicleEnterEvent event)
{