From c34349bb60ad53b38e9b18ee5f0779b85b91d1e6 Mon Sep 17 00:00:00 2001 From: dginovker Date: Sun, 8 Mar 2020 15:43:16 -0400 Subject: [PATCH 1/2] add ::give/::giveitem --- .../src/plugin/command/BetaCommandPlugin.java | 23 ++++++++++++++++++- .../slayer/dungeon/LumbridgeDungeon.java | 4 +++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Server/src/plugin/command/BetaCommandPlugin.java b/Server/src/plugin/command/BetaCommandPlugin.java index 370dfd202..7e947c76e 100644 --- a/Server/src/plugin/command/BetaCommandPlugin.java +++ b/Server/src/plugin/command/BetaCommandPlugin.java @@ -217,7 +217,28 @@ public final class BetaCommandPlugin extends CommandPlugin { item.setAmount(amount); player.getInventory().add(item); return true; - + + case "give": + case "giveitem": + if (args.length < 3) { + player.sendMessage("Syntax: ::give id amt playername"); + } + String n = ""; + for (int i = 1; i < args.length; i++) { + if (i == 1) { + n += args[i]; + continue; + } + n += " " + args[i]; + } + Player recipient = Repository.getPlayer(n); + if (recipient == null) { + player.debug("syntax error: name"); + return true; + } + recipient.getInventory().add(new Item(toInteger(args[1]), toInteger(args[2]))); + return true; + // Get item by name case "itemn": if (args.length < 2) { diff --git a/Server/src/plugin/skill/slayer/dungeon/LumbridgeDungeon.java b/Server/src/plugin/skill/slayer/dungeon/LumbridgeDungeon.java index f04be71aa..fc5177e41 100644 --- a/Server/src/plugin/skill/slayer/dungeon/LumbridgeDungeon.java +++ b/Server/src/plugin/skill/slayer/dungeon/LumbridgeDungeon.java @@ -172,7 +172,9 @@ public final class LumbridgeDungeon extends MapZone implements Plugin { @Override public int[] getIds() { - return Tasks.WALL_BEASTS.getTask().getNpcs(); + //return Tasks.WALL_BEASTS.getTask().getNpcs(); + int[] empty = {}; + return empty; } } From 8028b019b3bb632be40e8997e75ffab101647f30 Mon Sep 17 00:00:00 2001 From: dginovker Date: Sun, 8 Mar 2020 15:44:09 -0400 Subject: [PATCH 2/2] Fix house tele --- Server/src/plugin/command/BetaCommandPlugin.java | 9 ++++++--- Server/src/plugin/skill/magic/HouseTeleportPlugin.java | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Server/src/plugin/command/BetaCommandPlugin.java b/Server/src/plugin/command/BetaCommandPlugin.java index 7e947c76e..037d029d0 100644 --- a/Server/src/plugin/command/BetaCommandPlugin.java +++ b/Server/src/plugin/command/BetaCommandPlugin.java @@ -224,19 +224,22 @@ public final class BetaCommandPlugin extends CommandPlugin { player.sendMessage("Syntax: ::give id amt playername"); } String n = ""; - for (int i = 1; i < args.length; i++) { - if (i == 1) { + for (int i = 3; i < args.length; i++) { + if (i == 3) { n += args[i]; continue; } n += " " + args[i]; } + player.sendMessage("Giving " + n + " item.."); Player recipient = Repository.getPlayer(n); if (recipient == null) { player.debug("syntax error: name"); return true; } - recipient.getInventory().add(new Item(toInteger(args[1]), toInteger(args[2]))); + item = new Item(toInteger(args[1]), toInteger(args[2])); + item.setAmount(toInteger(args[2])); + recipient.getInventory().add(item); return true; // Get item by name diff --git a/Server/src/plugin/skill/magic/HouseTeleportPlugin.java b/Server/src/plugin/skill/magic/HouseTeleportPlugin.java index d65fb8ce7..29c995f61 100644 --- a/Server/src/plugin/skill/magic/HouseTeleportPlugin.java +++ b/Server/src/plugin/skill/magic/HouseTeleportPlugin.java @@ -35,7 +35,6 @@ public class HouseTeleportPlugin extends MagicSpell { @Override public boolean cast(Entity entity, Node target) { - System.out.println("Casting house tele"); if (((Player)entity).getHouseManager().getLocation().getExitLocation() == null) { ((Player)entity).sendMessage("You must have a house to teleport to before attempting that."); return false; @@ -45,9 +44,9 @@ public class HouseTeleportPlugin extends MagicSpell { return false; } if (entity.getTeleporter().send(location.transform(0, RandomFunction.random(3), 0), TeleportType.NORMAL)) { - entity.setAttribute("teleport:items", super.runes); entity.setAttribute("magic-delay", GameWorld.getTicks() + 5); + ((Player) entity).getInventory().remove(super.runes); return true; } return false;