From 3ae119d88aa279161d8bd9465a90c250af7b5656 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sun, 8 Jun 2014 11:27:14 -0500 Subject: [PATCH] Fixed hub package unlock bug. Fixed Champions build page open bug. MOved some code around because i'm a boss. --- .../src/mineplex/core/common/util/UtilInv.java | 2 +- .../Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java | 2 +- .../Mineplex.Hub/src/mineplex/hub/gadget/ui/PetTagPage.java | 4 ++-- Plugins/Mineplex.Hub/src/mineplex/hub/pet/Pet.java | 2 +- Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetClient.java | 4 ++-- Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetExtra.java | 2 +- Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetFactory.java | 4 ++-- Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetManager.java | 3 ++- .../src/mineplex/hub/pet/repository/PetRepository.java | 6 +++--- .../mineplex/hub}/pet/repository/token/ClientPetToken.java | 2 +- .../hub}/pet/repository/token/ClientPetTokenWrapper.java | 2 +- .../mineplex/hub}/pet/repository/token/PetChangeToken.java | 2 +- .../mineplex/hub}/pet/repository/token/PetExtraToken.java | 2 +- .../mineplex/hub}/pet/repository/token/PetSalesToken.java | 2 +- .../src/mineplex/hub}/pet/repository/token/PetToken.java | 2 +- .../src/nautilus/game/arcade/Arcade.java | 6 ++++-- .../src/nautilus/game/arcade/ArcadeManager.java | 5 +++-- .../game/arcade/game/games/champions/ChampionsDominate.java | 3 ++- .../nautilus/game/arcade/game/games/common/Domination.java | 3 ++- 19 files changed, 32 insertions(+), 26 deletions(-) rename Plugins/{Mineplex.Core/src/mineplex/core => Mineplex.Hub/src/mineplex/hub}/pet/repository/token/ClientPetToken.java (72%) rename Plugins/{Mineplex.Core/src/mineplex/core => Mineplex.Hub/src/mineplex/hub}/pet/repository/token/ClientPetTokenWrapper.java (68%) rename Plugins/{Mineplex.Core/src/mineplex/core => Mineplex.Hub/src/mineplex/hub}/pet/repository/token/PetChangeToken.java (69%) rename Plugins/{Mineplex.Core/src/mineplex/core => Mineplex.Hub/src/mineplex/hub}/pet/repository/token/PetExtraToken.java (64%) rename Plugins/{Mineplex.Core/src/mineplex/core => Mineplex.Hub/src/mineplex/hub}/pet/repository/token/PetSalesToken.java (64%) rename Plugins/{Mineplex.Core/src/mineplex/core => Mineplex.Hub/src/mineplex/hub}/pet/repository/token/PetToken.java (63%) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java index 69e34e12a..7285d4f34 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java @@ -85,7 +85,7 @@ public class UtilInv public static void Clear(Player player) { - player.getOpenInventory().close(); + //player.getOpenInventory().close(); PlayerInventory inv = player.getInventory(); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java index c5b1db5f9..3c19a848d 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java @@ -169,7 +169,7 @@ public class GadgetPage extends ShopPageBase itemLore.add(C.cBlack); itemLore.addAll(Arrays.asList(gadget.GetDescription())); - if (DonationManager.Get(Player.getName()).OwnsUnknownPackage(gadget.GetName())) + if (gadget.GetCost(CurrencyType.Gems) == -1 || DonationManager.Get(Player.getName()).OwnsUnknownPackage(gadget.GetName())) { if (gadget.GetActive().contains(Player)) { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/PetTagPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/PetTagPage.java index 34b645016..6d528a962 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/PetTagPage.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/PetTagPage.java @@ -9,8 +9,8 @@ import mineplex.core.donation.DonationManager; import mineplex.hub.gadget.GadgetManager; import mineplex.hub.pet.Pet; import mineplex.hub.pet.PetExtra; -import mineplex.core.pet.repository.token.PetChangeToken; -import mineplex.core.pet.repository.token.PetToken; +import mineplex.hub.pet.repository.token.PetChangeToken; +import mineplex.hub.pet.repository.token.PetToken; import mineplex.core.shop.page.ConfirmationPage; import mineplex.core.shop.page.ShopPageBase; import net.minecraft.server.v1_7_R3.ItemStack; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/Pet.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/Pet.java index 68c085ec0..7f0448362 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/Pet.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/Pet.java @@ -1,9 +1,9 @@ package mineplex.hub.pet; import mineplex.core.common.CurrencyType; -import mineplex.core.pet.repository.token.PetSalesToken; import mineplex.core.shop.item.SalesPackageBase; import mineplex.core.shop.item.ShopItem; +import mineplex.hub.pet.repository.token.PetSalesToken; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetClient.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetClient.java index cd092c2ca..6d38a8892 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetClient.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetClient.java @@ -3,8 +3,8 @@ package mineplex.hub.pet; import org.bukkit.entity.EntityType; import mineplex.core.common.util.NautHashMap; -import mineplex.core.pet.repository.token.ClientPetToken; -import mineplex.core.pet.repository.token.PetToken; +import mineplex.hub.pet.repository.token.ClientPetToken; +import mineplex.hub.pet.repository.token.PetToken; public class PetClient { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetExtra.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetExtra.java index 1d115a348..e95fa98b8 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetExtra.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetExtra.java @@ -2,8 +2,8 @@ package mineplex.hub.pet; import mineplex.core.common.CurrencyType; import mineplex.core.itemstack.ItemStackFactory; -import mineplex.core.pet.repository.token.PetExtraToken; import mineplex.core.shop.item.SalesPackageBase; +import mineplex.hub.pet.repository.token.PetExtraToken; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetFactory.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetFactory.java index 93691a9e6..b3dd0abd2 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetFactory.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetFactory.java @@ -5,9 +5,9 @@ import java.util.Collection; import java.util.List; import mineplex.core.common.util.NautHashMap; -import mineplex.core.pet.repository.token.PetExtraToken; -import mineplex.core.pet.repository.token.PetSalesToken; import mineplex.hub.pet.repository.PetRepository; +import mineplex.hub.pet.repository.token.PetExtraToken; +import mineplex.hub.pet.repository.token.PetSalesToken; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetManager.java index d4efdf7c0..9b304b007 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetManager.java @@ -5,7 +5,6 @@ import java.util.Iterator; import java.util.Map.Entry; import mineplex.core.MiniClientPlugin; -import mineplex.core.pet.repository.token.ClientPetTokenWrapper; import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.UpdateType; import mineplex.core.account.CoreClientManager; @@ -17,6 +16,7 @@ import mineplex.core.common.util.UtilInv; import mineplex.core.donation.DonationManager; import mineplex.core.itemstack.ItemStackFactory; import mineplex.hub.pet.repository.PetRepository; +import mineplex.hub.pet.repository.token.ClientPetTokenWrapper; import net.minecraft.server.v1_7_R3.EntityCreature; import net.minecraft.server.v1_7_R3.EntityHuman; import net.minecraft.server.v1_7_R3.EntityInsentient; @@ -30,6 +30,7 @@ import net.minecraft.server.v1_7_R3.PathfinderGoalSelector; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/PetRepository.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/PetRepository.java index d27b90691..b3687a30a 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/PetRepository.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/PetRepository.java @@ -4,11 +4,11 @@ import java.util.List; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; -import mineplex.core.pet.repository.token.PetChangeToken; -import mineplex.core.pet.repository.token.PetExtraToken; -import mineplex.core.pet.repository.token.PetSalesToken; import mineplex.core.server.remotecall.AsyncJsonWebCall; import mineplex.core.server.remotecall.JsonWebCall; +import mineplex.hub.pet.repository.token.PetChangeToken; +import mineplex.hub.pet.repository.token.PetExtraToken; +import mineplex.hub.pet.repository.token.PetSalesToken; public class PetRepository { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/ClientPetToken.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/ClientPetToken.java similarity index 72% rename from Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/ClientPetToken.java rename to Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/ClientPetToken.java index 5f45ac822..2c25b9d83 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/ClientPetToken.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/ClientPetToken.java @@ -1,4 +1,4 @@ -package mineplex.core.pet.repository.token; +package mineplex.hub.pet.repository.token; import java.util.List; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/ClientPetTokenWrapper.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/ClientPetTokenWrapper.java similarity index 68% rename from Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/ClientPetTokenWrapper.java rename to Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/ClientPetTokenWrapper.java index 3c8a0b274..2e9dbb215 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/ClientPetTokenWrapper.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/ClientPetTokenWrapper.java @@ -1,4 +1,4 @@ -package mineplex.core.pet.repository.token; +package mineplex.hub.pet.repository.token; public class ClientPetTokenWrapper { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetChangeToken.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetChangeToken.java similarity index 69% rename from Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetChangeToken.java rename to Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetChangeToken.java index e42a5e61e..cf6a199b8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetChangeToken.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetChangeToken.java @@ -1,4 +1,4 @@ -package mineplex.core.pet.repository.token; +package mineplex.hub.pet.repository.token; public class PetChangeToken { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetExtraToken.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetExtraToken.java similarity index 64% rename from Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetExtraToken.java rename to Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetExtraToken.java index c40324f0a..99e1c50a3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetExtraToken.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetExtraToken.java @@ -1,4 +1,4 @@ -package mineplex.core.pet.repository.token; +package mineplex.hub.pet.repository.token; public class PetExtraToken { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetSalesToken.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetSalesToken.java similarity index 64% rename from Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetSalesToken.java rename to Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetSalesToken.java index e427ac8ed..3b4d26b71 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetSalesToken.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetSalesToken.java @@ -1,4 +1,4 @@ -package mineplex.core.pet.repository.token; +package mineplex.hub.pet.repository.token; public class PetSalesToken { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetToken.java b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetToken.java similarity index 63% rename from Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetToken.java rename to Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetToken.java index fecdcde0f..d58fc6ca3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetToken.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetToken.java @@ -1,4 +1,4 @@ -package mineplex.core.pet.repository.token; +package mineplex.hub.pet.repository.token; public class PetToken { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index 696737858..02f6069f8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -27,6 +27,7 @@ import mineplex.core.monitor.LagMeter; import mineplex.core.npc.NpcManager; import mineplex.core.packethandler.PacketHandler; import mineplex.core.portal.Portal; +import mineplex.core.preferences.PreferencesManager; import mineplex.core.punish.Punish; import mineplex.core.recharge.Recharge; import mineplex.core.spawn.Spawn; @@ -76,7 +77,8 @@ public class Arcade extends JavaPlugin implements INautilusPlugin _donationManager = new DonationManager(this, GetWebServerAddress()); - new MessageManager(this, _clientManager); + PreferencesManager preferenceManager = new PreferencesManager(this, _clientManager, _donationManager); + new MessageManager(this, _clientManager, preferenceManager); AntiStack antistack = new AntiStack(this); @@ -96,7 +98,7 @@ public class Arcade extends JavaPlugin implements INautilusPlugin AntiHack.Initialize(this, punish, portal); //Arcade Manager - _gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, disguiseManager, creature, teleport, new Blood(this), antistack, portal, packetHandler, GetWebServerAddress()); + _gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, disguiseManager, creature, teleport, new Blood(this), antistack, portal, packetHandler, preferenceManager, GetWebServerAddress()); new MemoryFix(this); 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 17df798a0..ad2020c80 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -66,6 +66,7 @@ import mineplex.core.elo.EloManager; import mineplex.core.energy.Energy; import mineplex.core.explosion.Explosion; import mineplex.core.portal.Portal; +import mineplex.core.preferences.PreferencesManager; import mineplex.core.projectile.ProjectileManager; import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; @@ -120,7 +121,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation //Games private Game _game; - public ArcadeManager(Arcade plugin, ServerStatusManager serverStatusManager, GameServerConfig serverConfig, CoreClientManager clientManager, DonationManager donationManager, DamageManager damageManager, DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, AntiStack antistack, Portal portal, PacketHandler packetHandler, String webAddress) + public ArcadeManager(Arcade plugin, ServerStatusManager serverStatusManager, GameServerConfig serverConfig, CoreClientManager clientManager, DonationManager donationManager, DamageManager damageManager, DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, AntiStack antistack, Portal portal, PacketHandler packetHandler, PreferencesManager preferences, String webAddress) { super("Game Manager", plugin); @@ -151,7 +152,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation _clientManager = clientManager; - _chat = new Chat(plugin, _clientManager, serverStatusManager.getCurrentServerName()); + _chat = new Chat(plugin, _clientManager, preferences, serverStatusManager.getCurrentServerName()); _creature = creature; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java index 9b2cc93d1..0c0a297f9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java @@ -52,7 +52,7 @@ public class ChampionsDominate extends Domination Manager.GetDamage().UseSimpleWeaponDamage = false; - EloRanking = true; + EloRanking = false; EloStart = 1000; } @@ -64,6 +64,7 @@ public class ChampionsDominate extends Domination { SetKit(player, GetKits()[2], true); player.closeInventory(); + System.out.println("Closing inventory from validate kit"); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java index ba8ea7a5c..6f3c59720 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java @@ -53,7 +53,7 @@ public class Domination extends TeamGame private ArrayList _lastScoreboard = new ArrayList(); //Scores - private int _victoryScore = 1000; + private int _victoryScore = 15000; private int _redScore = 0; private int _blueScore = 0; @@ -348,6 +348,7 @@ public class Domination extends TeamGame { event.setCancelled(true); event.getWhoClicked().closeInventory(); + System.out.println("Closing inventory from crafting in Domination"); } }