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

Change how UHC handles time

Browse Source
This commit is contained in:
Sam 2016-11-13 12:35:38 +00:00
parent 07cd716cf7
commit efc73d220f
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java
View File

@ -215,13 +215,8 @@ public abstract class Skyfall extends Game
DamageFall = false; DamageFall = false;
SoupEnabled = true; SoupEnabled = true;
StrictAntiHack = false; StrictAntiHack = false;
<<<<<<< HEAD
new CompassModule().register(this); new CompassModule().register(this);
=======
CompassEnabled = true;
CompassGiveItem = false;
>>>>>>> refs/remotes/origin/develop
SpeedMeasurement = true; SpeedMeasurement = true;

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
View File

@ -86,11 +86,8 @@ import nautilus.game.arcade.game.games.skywars.kits.KitEarth;
import nautilus.game.arcade.game.games.skywars.kits.KitFire; import nautilus.game.arcade.game.games.skywars.kits.KitFire;
import nautilus.game.arcade.game.games.skywars.kits.KitIce; import nautilus.game.arcade.game.games.skywars.kits.KitIce;
import nautilus.game.arcade.game.games.skywars.kits.KitMetal; import nautilus.game.arcade.game.games.skywars.kits.KitMetal;
<<<<<<< HEAD
import nautilus.game.arcade.game.modules.compass.CompassModule; import nautilus.game.arcade.game.modules.compass.CompassModule;
=======
import nautilus.game.arcade.game.games.skywars.modes.kits.KitElementalist; import nautilus.game.arcade.game.games.skywars.modes.kits.KitElementalist;
>>>>>>> refs/remotes/origin/develop
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.ore.OreHider; import nautilus.game.arcade.ore.OreHider;