From 08140f88637a9403359e402a5fe9f490b4ad6e74 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 3 May 2015 08:10:25 +1200 Subject: [PATCH 1/3] ResourcePack: Resource pack refused now links to a forum guide --- .../nautilus/game/arcade/ArcadeManager.java | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 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 6d1ff9a47..8d8355415 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -42,6 +42,9 @@ import mineplex.core.blockrestore.BlockRestore; import mineplex.core.blood.Blood; import mineplex.core.chat.Chat; import mineplex.core.common.Rank; +import mineplex.core.common.jsonchat.ChildJsonMessage; +import mineplex.core.common.jsonchat.ClickEvent; +import mineplex.core.common.jsonchat.JsonMessage; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.NautHashMap; @@ -346,7 +349,21 @@ public class ArcadeManager extends MiniPlugin implements IRelation { _resourcePackNoResponse.remove(player.getName()); - returnHubNoResPack(player, "You need to accept the resource pack!"); + UtilPlayer.message(player, " "); + JsonMessage message = new JsonMessage("") + .color("gold") + .bold() + .extra("You need to accept the resource pack!\n" + + "Click me for instructions on how to fix this!") + + .click(ClickEvent.OPEN_URL, + + "http://mineplex.com/forums/m/11929946/viewthread/21554536-wizards-resource-pack-help"); + + message.sendToPlayer(player); + UtilPlayer.message(player, " "); + + returnHubNoResPack(player); } else if (response == EnumResourcePackStatus.FAILED_DOWNLOAD) { @@ -1363,15 +1380,20 @@ public class ArcadeManager extends MiniPlugin implements IRelation returnHubNoResPack(player, "You need to be using 1.8 to play " + GetGame().GetName() + "!"); } } - + + private void returnHubNoResPack(Player player) + { + player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f); + GetPortal().sendPlayerToServer(player, "Lobby"); + } + private void returnHubNoResPack(Player player, String message) { UtilPlayer.message(player, " "); UtilPlayer.message(player, C.cGold + C.Bold + message); UtilPlayer.message(player, " "); - - player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f); - GetPortal().sendPlayerToServer(player, "Lobby"); + + returnHubNoResPack(player); } @EventHandler From 3fcec13e68f1b120ce07cde30f53e87d18066b2a Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Mon, 4 May 2015 04:09:49 +1200 Subject: [PATCH 2/3] Wizards: Melee with wands should say it was wands that did it --- .../arcade/game/games/wizards/Wizards.java | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/Wizards.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/Wizards.java index 28c2c6ec0..26827c851 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/Wizards.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/Wizards.java @@ -35,7 +35,6 @@ import mineplex.core.packethandler.IPacketHandler; import mineplex.core.packethandler.PacketInfo; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import mineplex.minecraft.game.core.combat.CombatManager.AttackReason; import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.explosion.CustomExplosion; import nautilus.game.arcade.ArcadeManager; @@ -178,7 +177,7 @@ public class Wizards extends SoloGame } Manager.getCosmeticManager().setHideParticles(true); - Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.DefaultWeaponName); + // Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.DefaultWeaponName); createLoot(); @@ -307,6 +306,31 @@ public class Wizards extends SoloGame } } + @EventHandler + public void onWandHit(CustomDamageEvent event) + { + // Damager is ENTITY + if (event.GetDamagerEntity(true) != null) + { + if (event.GetReason() == null) + { + if (event.GetDamagerPlayer(false) != null) + { + Player damager = event.GetDamagerPlayer(false); + + if (damager.getInventory().getHeldItemSlot() < 5) + { + Wizard wizard = getWizard(damager); + + String reason = damager.getInventory().getHeldItemSlot() < wizard.getWandsOwned() ? "Wand" : "Fist"; + + event.AddMod(reason, reason, 0, true); + } + } + } + } + } + @EventHandler public void onDamage(CustomDamageEvent event) { @@ -1587,7 +1611,7 @@ public class Wizards extends SoloGame UtilPlayer.message(event.getViewers().get(0), C.cRed + "You may not craft weapons"); } - else if (mat == Material.STICK || mat.name().contains("_HOE")) + else if (mat == Material.STICK || mat == Material.BUCKET || mat.name().contains("_HOE")) { event.getInventory().setResult(new ItemStack(Material.AIR)); From b58bef1bd8b12c9c1c7a264a7e1526ba9bf40d0e Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Mon, 4 May 2015 04:13:23 +1200 Subject: [PATCH 3/3] ResourcePack: Lengthen timeout from 10 seconds to 20 seconds --- .../src/nautilus/game/arcade/ArcadeManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8d8355415..8c69eddb5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -1337,7 +1337,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation { Entry entry = itel.next(); - if (UtilTime.elapsed(entry.getValue(), 10000)) + if (UtilTime.elapsed(entry.getValue(), 20000)) { Player player = Bukkit.getPlayerExact(entry.getKey());