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

Fixed hub package unlock bug.

Browse Source 
Fixed Champions build page open bug.

MOved some code around because i'm a boss.
This commit is contained in:
Jonathan Williams 2014-06-08 11:27:14 -05:00
parent 967ff44d0a
commit 3ae119d88a
19 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java
View File

@ -85,7 +85,7 @@ public class UtilInv
public static void Clear(Player player) public static void Clear(Player player)
{ {
player.getOpenInventory().close(); //player.getOpenInventory().close();
PlayerInventory inv = player.getInventory(); PlayerInventory inv = player.getInventory();

2
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java
View File

@ -169,7 +169,7 @@ public class GadgetPage extends ShopPageBase<GadgetManager, GadgetShop>
itemLore.add(C.cBlack); itemLore.add(C.cBlack);
itemLore.addAll(Arrays.asList(gadget.GetDescription())); 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)) if (gadget.GetActive().contains(Player))
{ {

4
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/PetTagPage.java
View File

@ -9,8 +9,8 @@ import mineplex.core.donation.DonationManager;
import mineplex.hub.gadget.GadgetManager; import mineplex.hub.gadget.GadgetManager;
import mineplex.hub.pet.Pet; import mineplex.hub.pet.Pet;
import mineplex.hub.pet.PetExtra; import mineplex.hub.pet.PetExtra;
import mineplex.core.pet.repository.token.PetChangeToken; import mineplex.hub.pet.repository.token.PetChangeToken;
import mineplex.core.pet.repository.token.PetToken; import mineplex.hub.pet.repository.token.PetToken;
import mineplex.core.shop.page.ConfirmationPage; import mineplex.core.shop.page.ConfirmationPage;
import mineplex.core.shop.page.ShopPageBase; import mineplex.core.shop.page.ShopPageBase;
import net.minecraft.server.v1_7_R3.ItemStack; import net.minecraft.server.v1_7_R3.ItemStack;

2
Plugins/Mineplex.Hub/src/mineplex/hub/pet/Pet.java
View File

@ -1,9 +1,9 @@
package mineplex.hub.pet; package mineplex.hub.pet;
import mineplex.core.common.CurrencyType; import mineplex.core.common.CurrencyType;
import mineplex.core.pet.repository.token.PetSalesToken;
import mineplex.core.shop.item.SalesPackageBase; import mineplex.core.shop.item.SalesPackageBase;
import mineplex.core.shop.item.ShopItem; import mineplex.core.shop.item.ShopItem;
import mineplex.hub.pet.repository.token.PetSalesToken;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;

4
Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetClient.java
View File

@ -3,8 +3,8 @@ package mineplex.hub.pet;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import mineplex.core.common.util.NautHashMap; import mineplex.core.common.util.NautHashMap;
import mineplex.core.pet.repository.token.ClientPetToken; import mineplex.hub.pet.repository.token.ClientPetToken;
import mineplex.core.pet.repository.token.PetToken; import mineplex.hub.pet.repository.token.PetToken;
public class PetClient public class PetClient
{ {

2
Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetExtra.java
View File

@ -2,8 +2,8 @@ package mineplex.hub.pet;
import mineplex.core.common.CurrencyType; import mineplex.core.common.CurrencyType;
import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.pet.repository.token.PetExtraToken;
import mineplex.core.shop.item.SalesPackageBase; import mineplex.core.shop.item.SalesPackageBase;
import mineplex.hub.pet.repository.token.PetExtraToken;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;

4
Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetFactory.java
View File

@ -5,9 +5,9 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import mineplex.core.common.util.NautHashMap; 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.PetRepository;
import mineplex.hub.pet.repository.token.PetExtraToken;
import mineplex.hub.pet.repository.token.PetSalesToken;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;

3
Plugins/Mineplex.Hub/src/mineplex/hub/pet/PetManager.java
View File

@ -5,7 +5,6 @@ import java.util.Iterator;
import java.util.Map.Entry; import java.util.Map.Entry;
import mineplex.core.MiniClientPlugin; import mineplex.core.MiniClientPlugin;
import mineplex.core.pet.repository.token.ClientPetTokenWrapper;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.account.CoreClientManager; import mineplex.core.account.CoreClientManager;
@ -17,6 +16,7 @@ import mineplex.core.common.util.UtilInv;
import mineplex.core.donation.DonationManager; import mineplex.core.donation.DonationManager;
import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.itemstack.ItemStackFactory;
import mineplex.hub.pet.repository.PetRepository; 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.EntityCreature;
import net.minecraft.server.v1_7_R3.EntityHuman; import net.minecraft.server.v1_7_R3.EntityHuman;
import net.minecraft.server.v1_7_R3.EntityInsentient; 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.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;

6
Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/PetRepository.java
View File

@ -4,11 +4,11 @@ import java.util.List;
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; 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.AsyncJsonWebCall;
import mineplex.core.server.remotecall.JsonWebCall; 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 public class PetRepository
{ {

2
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/ClientPetToken.java → Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/ClientPetToken.java
View File

@ -1,4 +1,4 @@
package mineplex.core.pet.repository.token; package mineplex.hub.pet.repository.token;
import java.util.List; import java.util.List;

2
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/ClientPetTokenWrapper.java → Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/ClientPetTokenWrapper.java
View File

@ -1,4 +1,4 @@
package mineplex.core.pet.repository.token; package mineplex.hub.pet.repository.token;
public class ClientPetTokenWrapper public class ClientPetTokenWrapper
{ {

2
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetChangeToken.java → Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetChangeToken.java
View File

@ -1,4 +1,4 @@
package mineplex.core.pet.repository.token; package mineplex.hub.pet.repository.token;
public class PetChangeToken public class PetChangeToken
{ {

2
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetExtraToken.java → Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetExtraToken.java
View File

@ -1,4 +1,4 @@
package mineplex.core.pet.repository.token; package mineplex.hub.pet.repository.token;
public class PetExtraToken public class PetExtraToken
{ {

2
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetSalesToken.java → Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetSalesToken.java
View File

@ -1,4 +1,4 @@
package mineplex.core.pet.repository.token; package mineplex.hub.pet.repository.token;
public class PetSalesToken public class PetSalesToken
{ {

2
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/token/PetToken.java → Plugins/Mineplex.Hub/src/mineplex/hub/pet/repository/token/PetToken.java
View File

@ -1,4 +1,4 @@
package mineplex.core.pet.repository.token; package mineplex.hub.pet.repository.token;
public class PetToken public class PetToken
{ {

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
View File

@ -27,6 +27,7 @@ import mineplex.core.monitor.LagMeter;
import mineplex.core.npc.NpcManager; import mineplex.core.npc.NpcManager;
import mineplex.core.packethandler.PacketHandler; import mineplex.core.packethandler.PacketHandler;
import mineplex.core.portal.Portal; import mineplex.core.portal.Portal;
import mineplex.core.preferences.PreferencesManager;
import mineplex.core.punish.Punish; import mineplex.core.punish.Punish;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import mineplex.core.spawn.Spawn; import mineplex.core.spawn.Spawn;
@ -76,7 +77,8 @@ public class Arcade extends JavaPlugin implements INautilusPlugin
_donationManager = new DonationManager(this, GetWebServerAddress()); _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); AntiStack antistack = new AntiStack(this);
@ -96,7 +98,7 @@ public class Arcade extends JavaPlugin implements INautilusPlugin
AntiHack.Initialize(this, punish, portal); AntiHack.Initialize(this, punish, portal);
//Arcade Manager //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); new MemoryFix(this);

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -66,6 +66,7 @@ import mineplex.core.elo.EloManager;
import mineplex.core.energy.Energy; import mineplex.core.energy.Energy;
import mineplex.core.explosion.Explosion; import mineplex.core.explosion.Explosion;
import mineplex.core.portal.Portal; import mineplex.core.portal.Portal;
import mineplex.core.preferences.PreferencesManager;
import mineplex.core.projectile.ProjectileManager; import mineplex.core.projectile.ProjectileManager;
import mineplex.core.stats.StatsManager; import mineplex.core.stats.StatsManager;
import mineplex.core.status.ServerStatusManager; import mineplex.core.status.ServerStatusManager;
@ -120,7 +121,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
//Games //Games
private Game _game; 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); super("Game Manager", plugin);
@ -151,7 +152,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
_clientManager = clientManager; _clientManager = clientManager;
_chat = new Chat(plugin, _clientManager, serverStatusManager.getCurrentServerName()); _chat = new Chat(plugin, _clientManager, preferences, serverStatusManager.getCurrentServerName());
_creature = creature; _creature = creature;

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
View File

@ -52,7 +52,7 @@ public class ChampionsDominate extends Domination
Manager.GetDamage().UseSimpleWeaponDamage = false; Manager.GetDamage().UseSimpleWeaponDamage = false;
EloRanking = true; EloRanking = false;
EloStart = 1000; EloStart = 1000;
} }
@ -64,6 +64,7 @@ public class ChampionsDominate extends Domination
{ {
SetKit(player, GetKits()[2], true); SetKit(player, GetKits()[2], true);
player.closeInventory(); player.closeInventory();
System.out.println("Closing inventory from validate kit");
} }
} }

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java
View File

@ -53,7 +53,7 @@ public class Domination extends TeamGame
private ArrayList<String> _lastScoreboard = new ArrayList<String>(); private ArrayList<String> _lastScoreboard = new ArrayList<String>();
//Scores //Scores
private int _victoryScore = 1000; private int _victoryScore = 15000;
private int _redScore = 0; private int _redScore = 0;
private int _blueScore = 0; private int _blueScore = 0;
@ -348,6 +348,7 @@ public class Domination extends TeamGame
{ {
event.setCancelled(true); event.setCancelled(true);
event.getWhoClicked().closeInventory(); event.getWhoClicked().closeInventory();
System.out.println("Closing inventory from crafting in Domination");
} }
} }