From 8028b019b3bb632be40e8997e75ffab101647f30 Mon Sep 17 00:00:00 2001
From: dginovker <dcress01@uoguelph.ca>
Date: Sun, 8 Mar 2020 15:44:09 -0400
Subject: [PATCH] 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;