From efc73d220f8ad33e39f4c072667e5ae9b66f2ee2 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 13 Nov 2016 12:35:38 +0000 Subject: [PATCH] Change how UHC handles time --- .../src/nautilus/game/arcade/game/games/skyfall/Skyfall.java | 5 ----- .../src/nautilus/game/arcade/game/games/skywars/Skywars.java | 3 --- 2 files changed, 8 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java index fea965ebd..45acac22a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java @@ -215,13 +215,8 @@ public abstract class Skyfall extends Game DamageFall = false; SoupEnabled = true; StrictAntiHack = false; -<<<<<<< HEAD new CompassModule().register(this); -======= - CompassEnabled = true; - CompassGiveItem = false; ->>>>>>> refs/remotes/origin/develop SpeedMeasurement = true; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java index dd54fccfa..09cf7e6b6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java @@ -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.KitIce; import nautilus.game.arcade.game.games.skywars.kits.KitMetal; -<<<<<<< HEAD import nautilus.game.arcade.game.modules.compass.CompassModule; -======= import nautilus.game.arcade.game.games.skywars.modes.kits.KitElementalist; ->>>>>>> refs/remotes/origin/develop import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.ore.OreHider;