From 42b932e612e22174ffaea4ef496e7c8c05f96b19 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sat, 12 Oct 2013 01:55:32 -0700 Subject: [PATCH 1/3] Added inventory move prevention for all inventories Prevent bone from being turned into bonemeal and being fed to pet wolf. Fixed Dominate shop in hub. --- .../src/mineplex/core/common/util/UtilInv.java | 7 ++++++- .../src/mineplex/core/pet/PetManager.java | 14 +++++++++++++- Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) 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 40b59e1a7..3d43f9a97 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 @@ -184,6 +184,11 @@ public class UtilInv } public static void DisallowMovementOf(InventoryClickEvent event, String name, Material type, byte data, boolean inform) + { + DisallowMovementOf(event, name, type, data, inform, false); + } + + public static void DisallowMovementOf(InventoryClickEvent event, String name, Material type, byte data, boolean inform, boolean allInventorties) { /* System.out.println("Inv Type: " + event.getInventory().getType()); @@ -203,7 +208,7 @@ public class UtilInv */ //Do what you want in Crafting Inv - if (event.getInventory().getType() == InventoryType.CRAFTING) + if (!allInventorties && event.getInventory().getType() == InventoryType.CRAFTING) return; //Hotbar Swap diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java index 972ada928..65a533048 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java @@ -43,6 +43,7 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; @@ -162,13 +163,24 @@ public class PetManager extends MiniClientPlugin if (event.hasItem() && event.getItem().getType() == Material.BONE) { _petShop.attemptShopOpen(event.getPlayer()); + event.setCancelled(true); + } + } + + @EventHandler + public void preventWolfBone(PlayerInteractEntityEvent event) + { + if (event.getPlayer().getItemInHand().getType() == Material.BONE) + { + event.setCancelled(true); + event.getPlayer().updateInventory(); } } @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerInventoryClick(InventoryClickEvent event) { - UtilInv.DisallowMovementOf(event, "Pet Menu", Material.BONE, (byte)0, true); + UtilInv.DisallowMovementOf(event, "Pet Menu", Material.BONE, (byte)0, true, true); } @EventHandler diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index 8d524ab69..108e41594 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -100,7 +100,7 @@ public class Hub extends JavaPlugin implements INautilusPlugin, IRelation ClassShopManager shopManager = new ClassShopManager(this, classManager, skillManager, null); new ClassCombatShop(shopManager, clientManager, donationManager, "Select Class Here"); - new ClassCombatPurchaseShop(shopManager, clientManager, donationManager, "Skill Shop"); + new ClassCombatPurchaseShop(shopManager, clientManager, donationManager, "Class Shop"); new ClassCombatCustomBuildShop(shopManager, clientManager, donationManager, "Class Setup"); //Updates From e7230752985a9efb7e1d68caff373d05821e6533 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sat, 12 Oct 2013 02:52:35 -0700 Subject: [PATCH 2/3] Increased lobby menu size. Fixed memory leak in Explosion --- .../Mineplex.Core/src/mineplex/core/explosion/Explosion.java | 2 +- Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java b/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java index 965408d5f..8d62021b4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java @@ -202,7 +202,7 @@ public class Explosion extends MiniPlugin { FallingBlock cur = fallingIterator.next(); - if (!cur.isValid() || cur.getTicksLived() > 400) + if (cur.isDead() || !cur.isValid() || cur.getTicksLived() > 400) { fallingIterator.remove(); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java index 9fb2cbab3..b954d90b8 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java @@ -25,7 +25,7 @@ public class LobbyMenu extends ShopPageBase implements public LobbyMenu(ServerManager plugin, LobbyShop lobbyShop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player, String serverGroup) { - super(plugin, lobbyShop, clientManager, donationManager, name, player, 27); + super(plugin, lobbyShop, clientManager, donationManager, name, player, 36); _serverGroup = serverGroup; From c5385ee7dc918718f15cdce3a2c0cae1c1e7eb86 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sat, 12 Oct 2013 02:53:22 -0700 Subject: [PATCH 3/3] Fixed ultra join in arcade manager. --- .../src/nautilus/game/arcade/ArcadeManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 c2a60c17a..2d3594589 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -402,8 +402,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation return GetServerConfig().MaxPlayers; } - - public void HubClock(Player player) { player.getInventory().setItem(8, ItemStackFactory.Instance.CreateStack(Material.WATCH, (byte)0, 1, (short)0, C.cGreen + "Return to Hub", @@ -416,7 +414,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation // Reserved Slot Check if (Bukkit.getOnlinePlayers().length >= Bukkit.getServer().getMaxPlayers()) { - if (_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.HELPER, false) || _donationManager.Get(event.getPlayer().getName()).OwnsUnknownPackage(_serverConfig.ServerType + " ULTRA")) + if (_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.ULTRA, false) || _donationManager.Get(event.getPlayer().getName()).OwnsUnknownPackage(_serverConfig.ServerType + " ULTRA")) { event.allow(); event.setResult(PlayerLoginEvent.Result.ALLOWED);