From dd9e6a6866675372584b1967cd1d139c369d2d70 Mon Sep 17 00:00:00 2001 From: Jeremiah Bishop Date: Thu, 18 Jun 2015 14:54:26 -0400 Subject: [PATCH] Started adding SkyWars game mechanics --- Plugins/.idea/misc.xml | 2 +- .../ultra/client/UltraAPIException.java | 2 +- .../core/donation/command/CoinCommand.java | 9 +- .../core/donation/command/GoldCommand.java | 7 +- .../src/mineplex/core/memory/MemoryFix.java | 2 - .../src/mineplex/core/punish/Category.java | 2 + .../.classpath | 2 +- Plugins/Mineplex.EnjinTranslator/.classpath | 2 +- .../src/mineplex/game/clans/Farming.java | 1 + .../Mineplex.Minecraft.BungeeSigns/.classpath | 2 +- Plugins/Mineplex.PlayerCache/.classpath | 2 +- Plugins/Mineplex.StaffServer/.classpath | 2 +- .../src/mineplex/staffServer/StaffServer.java | 3 - .../customerSupport/CustomerSupport.java | 30 ++-- .../nautilus/game/arcade/ArcadeManager.java | 2 + .../src/nautilus/game/arcade/GameType.java | 2 + .../arcade/game/games/skywars/SkyWars.java | 162 ++++++++++++++++++ Plugins/Nautilus.Game.CaptureThePig/.project | 10 -- Plugins/Nautilus.Game.MineKart/.classpath | 5 +- .../src/nautilus/game/minekart/MineKart.java | 14 +- Plugins/Nautilus.Game.PvP/.classpath | 1 - .../game/pvp/repository/PvPRepository.java | 6 +- Plugins/Nautilus.Game.Tutorial/.classpath | 1 - 23 files changed, 204 insertions(+), 67 deletions(-) create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java diff --git a/Plugins/.idea/misc.xml b/Plugins/.idea/misc.xml index 0bef5b45e..76fba6e9f 100644 --- a/Plugins/.idea/misc.xml +++ b/Plugins/.idea/misc.xml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/Plugins/Mineplex.BungeeRotator/src/biz/neustar/ultra/client/UltraAPIException.java b/Plugins/Mineplex.BungeeRotator/src/biz/neustar/ultra/client/UltraAPIException.java index 09c8f92b6..28ca9ed82 100644 --- a/Plugins/Mineplex.BungeeRotator/src/biz/neustar/ultra/client/UltraAPIException.java +++ b/Plugins/Mineplex.BungeeRotator/src/biz/neustar/ultra/client/UltraAPIException.java @@ -5,7 +5,7 @@ import com.neustar.ultra.api.webservice.v01.UltraWSException; /* * User: jbodner * Date: 1/28/13 - * Time: 1:11 PM + * Time: 1:11 PM4 * * Copyright 2000-2013 NeuStar, Inc. All rights reserved. * NeuStar, the Neustar logo and related names and logos are registered diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java index bff145333..b7731edfa 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java @@ -1,23 +1,20 @@ package mineplex.core.donation.command; -import java.util.UUID; - -import org.bukkit.entity.Player; - import mineplex.core.account.CoreClient; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; -import mineplex.core.common.util.UUIDFetcher; import mineplex.core.common.util.UtilPlayer; import mineplex.core.donation.DonationManager; +import org.bukkit.entity.Player; + public class CoinCommand extends CommandBase { public CoinCommand(DonationManager plugin) { - super(plugin, Rank.ADMIN, "coin"); + super(plugin, Rank.ULTRA, "coin"); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/command/GoldCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/command/GoldCommand.java index 28a435e02..6fa015312 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/donation/command/GoldCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/command/GoldCommand.java @@ -1,18 +1,15 @@ package mineplex.core.donation.command; -import java.util.UUID; - -import org.bukkit.entity.Player; - import mineplex.core.account.CoreClient; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; -import mineplex.core.common.util.UUIDFetcher; import mineplex.core.common.util.UtilPlayer; import mineplex.core.donation.DonationManager; +import org.bukkit.entity.Player; + public class GoldCommand extends CommandBase { public GoldCommand(DonationManager plugin) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java b/Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java index 5974b6091..105351e12 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java @@ -7,9 +7,7 @@ import mineplex.core.MiniPlugin; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import net.minecraft.server.v1_7_R4.CraftingManager; -import net.minecraft.server.v1_7_R4.EntityTracker; import net.minecraft.server.v1_7_R4.IInventory; -import net.minecraft.server.v1_7_R4.IntHashMap; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/Category.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/Category.java index 17ad36943..5e3805657 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/punish/Category.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/Category.java @@ -10,6 +10,8 @@ public enum Category PermMute, Other; // Represents perm ban - (or old perm mutes) + //test + public static boolean contains(String s) { try diff --git a/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath b/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath index a622fd726..3cc5b666a 100644 --- a/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath +++ b/Plugins/Mineplex.DDoSProtectionSwitcher/.classpath @@ -1,11 +1,11 @@ - + diff --git a/Plugins/Mineplex.EnjinTranslator/.classpath b/Plugins/Mineplex.EnjinTranslator/.classpath index 76585c180..224f11ab1 100644 --- a/Plugins/Mineplex.EnjinTranslator/.classpath +++ b/Plugins/Mineplex.EnjinTranslator/.classpath @@ -1,10 +1,10 @@ - + diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Farming.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Farming.java index 85590f47a..8abcc527d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Farming.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Farming.java @@ -41,6 +41,7 @@ public class Farming extends MiniPlugin ItemStackFactory.Instance.CreateStack(Material.GOLDEN_APPLE)); } + @SuppressWarnings("deprecation") @EventHandler public void BlockPlace(BlockPlaceEvent event) { diff --git a/Plugins/Mineplex.Minecraft.BungeeSigns/.classpath b/Plugins/Mineplex.Minecraft.BungeeSigns/.classpath index 211cf1dd3..3928b1d4c 100644 --- a/Plugins/Mineplex.Minecraft.BungeeSigns/.classpath +++ b/Plugins/Mineplex.Minecraft.BungeeSigns/.classpath @@ -1,7 +1,7 @@ - + diff --git a/Plugins/Mineplex.PlayerCache/.classpath b/Plugins/Mineplex.PlayerCache/.classpath index 7a237e253..e5ed569d5 100644 --- a/Plugins/Mineplex.PlayerCache/.classpath +++ b/Plugins/Mineplex.PlayerCache/.classpath @@ -1,7 +1,7 @@ - + diff --git a/Plugins/Mineplex.StaffServer/.classpath b/Plugins/Mineplex.StaffServer/.classpath index 69044860b..808bb8d8b 100644 --- a/Plugins/Mineplex.StaffServer/.classpath +++ b/Plugins/Mineplex.StaffServer/.classpath @@ -1,7 +1,6 @@ - @@ -12,5 +11,6 @@ + diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java index abc5330d1..ecea2ba64 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java @@ -6,8 +6,6 @@ import mineplex.core.account.CoreClientManager; import mineplex.core.antihack.AntiHack; import mineplex.core.chat.Chat; import mineplex.core.command.CommandCenter; -import mineplex.core.common.util.ProfileLoader; -import mineplex.core.common.util.UUIDFetcher; import mineplex.core.creature.Creature; import mineplex.core.donation.DonationManager; import mineplex.core.inventory.InventoryManager; @@ -23,7 +21,6 @@ import mineplex.core.status.ServerStatusManager; import mineplex.core.updater.FileUpdater; import mineplex.core.updater.Updater; import mineplex.staffServer.customerSupport.CustomerSupport; -import mineplex.staffServer.password.Password; import mineplex.staffServer.salespackage.SalesPackageManager; import net.minecraft.server.v1_7_R4.MinecraftServer; import net.minecraft.util.com.mojang.authlib.GameProfile; diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java index c91eb71a9..cb9dcedf9 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java @@ -2,33 +2,31 @@ package mineplex.staffServer.customerSupport; import java.util.HashSet; +import mineplex.core.MiniPlugin; +import mineplex.core.account.CoreClient; +import mineplex.core.account.CoreClientManager; +import mineplex.core.common.Rank; +import mineplex.core.common.util.C; +import mineplex.core.common.util.F; +import mineplex.core.common.util.NautHashMap; +import mineplex.core.donation.DonationManager; +import mineplex.core.donation.Donor; +import mineplex.core.donation.repository.token.CoinTransactionToken; +import mineplex.core.donation.repository.token.TransactionToken; +import mineplex.staffServer.salespackage.SalesPackageManager; + import org.bukkit.GameMode; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.FoodLevelChangeEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.entity.FoodLevelChangeEvent; import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.MiniPlugin; -import mineplex.core.account.CoreClient; -import mineplex.core.account.CoreClientManager; -import mineplex.core.common.Rank; -import mineplex.core.common.jsonchat.JsonMessage; -import mineplex.core.common.util.C; -import mineplex.core.common.util.F; -import mineplex.core.common.util.NautHashMap; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.donation.DonationManager; -import mineplex.core.donation.Donor; -import mineplex.core.donation.repository.token.CoinTransactionToken; -import mineplex.core.donation.repository.token.TransactionToken; -import mineplex.staffServer.salespackage.SalesPackageManager; - public class CustomerSupport extends MiniPlugin { private CoreClientManager _clientManager; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index df3a9868c..f5c4414d9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -877,8 +877,10 @@ public class ArcadeManager extends MiniPlugin implements IRelation public ArrayList LoadFiles(String gameName) { TimingManager.start("ArcadeManager LoadFiles"); + File folder = new File(".." + File.separatorChar + ".." + File.separatorChar + "update" + File.separatorChar + "maps" + File.separatorChar + gameName); + System.out.println(folder.getAbsolutePath()+" -=-=-=-=-=" ); if (!folder.exists()) folder.mkdirs(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java index 28d79a4b5..06d3e86ca 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java @@ -35,6 +35,7 @@ import nautilus.game.arcade.game.games.quiver.QuiverTeams; import nautilus.game.arcade.game.games.runner.Runner; import nautilus.game.arcade.game.games.searchanddestroy.SearchAndDestroy; import nautilus.game.arcade.game.games.sheep.SheepGame; +import nautilus.game.arcade.game.games.skywars.SkyWars; import nautilus.game.arcade.game.games.smash.SuperSmash; import nautilus.game.arcade.game.games.smash.SuperSmashDominate; import nautilus.game.arcade.game.games.smash.SuperSmashTeam; @@ -92,6 +93,7 @@ public enum GameType Runner(Runner.class, "Runner", Material.LEATHER_BOOTS, (byte)0, GameCategory.ARCADE, 31), SearchAndDestroy(SearchAndDestroy.class, "Search and Destroy", Material.TNT, (byte)0, GameCategory.SURVIVAL, 32), Sheep(SheepGame.class, "Sheep Quest", Material.WOOL, (byte)4, GameCategory.ARCADE, 33), + Skywars(SkyWars.class, "SkyWars", Material.CHEST, (byte)0, GameCategory.SURVIVAL, 52), Smash(SuperSmash.class, "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.CLASSICS, 34), SmashDomination(SuperSmashDominate.class, "Super Smash Mobs Domination", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.EXTRA, 36), SmashTeams(SuperSmashTeam.class, "Super Smash Mobs Teams", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.TEAM_VARIANT, 35), 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 new file mode 100644 index 000000000..0b93844ed --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java @@ -0,0 +1,162 @@ +package nautilus.game.arcade.game.games.skywars; + +import java.util.ArrayList; +import java.util.HashSet; + +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.event.EventHandler; +import org.bukkit.event.block.BlockPlaceEvent; + +import mineplex.core.common.util.UtilBlock; +import mineplex.core.common.util.UtilMath; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; +import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.GameType; +import nautilus.game.arcade.events.GameStateChangeEvent; +import nautilus.game.arcade.game.SoloGame; +import nautilus.game.arcade.kit.Kit; + +public class SkyWars extends SoloGame { + + + + private ArrayList _blocks = new ArrayList(); + + public SkyWars(ArcadeManager manager) { + super(manager, GameType.Skywars, new Kit[] {}, new String[] { + "Battle in the sky!", + "Collect loot from chests to get better armor", + "Last player alive wins!" }); + + PrepareFreeze = false; + + StrictAntiHack = true; + + GameTimeout = 1500000; + + QuitDropItems = true; + + WorldTimeSet = 0; + WorldBoundaryKill = false; + + SpawnDistanceRequirement = 48; + + DamageSelf = true; + DamageTeamSelf = true; + + DeathDropItems = true; + + ItemDrop = true; + ItemPickup = true; + + InventoryClick = true; + InventoryOpenBlock = true; + InventoryOpenChest = true; + + PlaySoundGameStart = false; + PrepareTime = 15000; + + VersionRequire1_8 = true; + + _help = new String[] + { + "This game is still under heavy development!", + "Don't walk near the edge... You can get knocked off!", + "Access the TNT generator at mid to fire TNT!" + }; + + } + + + @SuppressWarnings("deprecation") + @EventHandler + public void CreateRandomChests(GameStateChangeEvent event) + { + if (event.GetState() != GameState.Recruit) + return; + + HashSet ignore = new HashSet(); + + ignore.add(Material.LEAVES); + + int xDiff = WorldData.MaxX - WorldData.MinX; + int zDiff = WorldData.MaxZ - WorldData.MinZ; + + int done = 0; + + while (done < 40) + { + + Block block = UtilBlock.getHighest(WorldData.World, WorldData.MinX + UtilMath.r(xDiff), + WorldData.MinZ + UtilMath.r(zDiff), ignore); + + if (!UtilBlock.airFoliage(block) || !UtilBlock.solid(block.getRelative(BlockFace.DOWN))) + continue; + + block.setTypeIdAndData(Material.CHEST.getId(), (byte) UtilMath.r(4), true); + done++; + } + } + + @EventHandler + public void BlockPlace(BlockPlaceEvent event) + { + if (event.isCancelled()) + return; + + _blocks.add(event.getBlock()); + } + + @SuppressWarnings("deprecation") + @EventHandler + public void BlockUpdate(UpdateEvent event) + { + if (event.getType() != UpdateType.TICK) + return; + + if (!IsLive()) + return; + + if (_blocks.isEmpty()) + return; + + //TimingManager.start("Block Fall"); + + for (int i = 0 ; i < 3 ; i++) + { + Block bestBlock = null; + double bestDist = 0; + + for (Block block : _blocks) + { + double dist = UtilMath.offset2d(GetSpectatorLocation(), block.getLocation().add(0.5, 0.5, 0.5)); + + if (bestBlock == null || dist > bestDist) + { + bestBlock = block; + bestDist = dist; + } + } + + //Shuffle Down + while (bestBlock.getRelative(BlockFace.DOWN).getType() != Material.AIR) + bestBlock = bestBlock.getRelative(BlockFace.DOWN); + + _blocks.remove(bestBlock); + + if (bestBlock.getType() != Material.AIR) + { + if (Math.random() > 0.75) + bestBlock.getWorld().spawnFallingBlock(bestBlock.getLocation().add(0.5, 0.5, 0.5), bestBlock.getType(), bestBlock.getData()); + + bestBlock.setType(Material.AIR); + } + } + + //TimingManager.stop("Block Fall"); + } + +} diff --git a/Plugins/Nautilus.Game.CaptureThePig/.project b/Plugins/Nautilus.Game.CaptureThePig/.project index 5342dbc0b..5e42cb5d5 100644 --- a/Plugins/Nautilus.Game.CaptureThePig/.project +++ b/Plugins/Nautilus.Game.CaptureThePig/.project @@ -10,16 +10,6 @@ - - org.eclipse.ui.externaltools.ExternalToolBuilder - auto,full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/CaptureThePig.launch - - - org.eclipse.jdt.core.javanature diff --git a/Plugins/Nautilus.Game.MineKart/.classpath b/Plugins/Nautilus.Game.MineKart/.classpath index 652a7606a..7d34fcad1 100644 --- a/Plugins/Nautilus.Game.MineKart/.classpath +++ b/Plugins/Nautilus.Game.MineKart/.classpath @@ -2,11 +2,10 @@ - - - + + diff --git a/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java b/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java index 17bb5b3ac..7aee84f55 100644 --- a/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java +++ b/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java @@ -5,24 +5,19 @@ import java.io.FileFilter; import java.io.IOException; import mineplex.core.account.CoreClientManager; -import mineplex.core.antistack.AntiStack; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.command.CommandCenter; import mineplex.core.common.CurrencyType; import mineplex.core.creature.Creature; import mineplex.core.donation.DonationManager; import mineplex.core.explosion.Explosion; -import mineplex.core.fakeEntity.FakeEntity; -import mineplex.core.fakeEntity.FakeEntityManager; import mineplex.core.itemstack.ItemStackFactory; -import mineplex.core.join.JoinQuit; import mineplex.core.memory.MemoryFix; import mineplex.core.monitor.LagMeter; import mineplex.core.npc.NpcManager; import mineplex.core.packethandler.PacketHandler; import mineplex.core.punish.Punish; import mineplex.core.recharge.Recharge; -import mineplex.core.server.ServerListener; import mineplex.core.spawn.Spawn; import mineplex.core.status.ServerStatusManager; import mineplex.core.teleport.Teleport; @@ -34,14 +29,13 @@ import nautilus.game.minekart.repository.KartRepository; import nautilus.game.minekart.shop.KartShop; import nautilus.game.minekart.track.TrackManager; import nautilus.game.minekart.track.TrackProcessor; -import nautilus.minecraft.core.INautilusPlugin; -import net.minecraft.server.v1_7_R1.EntityPlayer; +import net.minecraft.server.v1_7_R4.EntityPlayer; +import net.minecraft.util.org.apache.commons.io.FileDeleteStrategy; -import org.apache.commons.io.FileDeleteStrategy; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Server; -import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -58,6 +52,8 @@ import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; + + public class MineKart extends JavaPlugin implements INautilusPlugin, Listener { diff --git a/Plugins/Nautilus.Game.PvP/.classpath b/Plugins/Nautilus.Game.PvP/.classpath index e94501478..f2ec6207b 100644 --- a/Plugins/Nautilus.Game.PvP/.classpath +++ b/Plugins/Nautilus.Game.PvP/.classpath @@ -1,7 +1,6 @@ - diff --git a/Plugins/Nautilus.Game.PvP/src/nautilus/game/pvp/repository/PvPRepository.java b/Plugins/Nautilus.Game.PvP/src/nautilus/game/pvp/repository/PvPRepository.java index 9fc22adaf..cd9720bd6 100644 --- a/Plugins/Nautilus.Game.PvP/src/nautilus/game/pvp/repository/PvPRepository.java +++ b/Plugins/Nautilus.Game.PvP/src/nautilus/game/pvp/repository/PvPRepository.java @@ -2,14 +2,12 @@ package nautilus.game.pvp.repository; import java.util.List; -import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; - -import mineplex.core.server.RemoteRepository; import mineplex.core.server.remotecall.AsyncJsonWebCall; import mineplex.core.server.remotecall.JsonWebCall; import nautilus.game.pvp.modules.Fishing.Fish; import nautilus.game.pvp.modules.Fishing.FishData; -import nautilus.minecraft.core.webserver.token.Account.FishToken; + +import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; public class PvPRepository extends RemoteRepository { diff --git a/Plugins/Nautilus.Game.Tutorial/.classpath b/Plugins/Nautilus.Game.Tutorial/.classpath index de05cb163..2b464fa00 100644 --- a/Plugins/Nautilus.Game.Tutorial/.classpath +++ b/Plugins/Nautilus.Game.Tutorial/.classpath @@ -5,7 +5,6 @@ -