From d967b132399bdf7528fc7e10f3f6270753ec0789 Mon Sep 17 00:00:00 2001
From: kuroppoi <68156848+kuroppoi@users.noreply.github.com>
Date: Sat, 24 Apr 2021 20:54:47 +0200
Subject: [PATCH] Security checks

---
 .../server/requests/InventoryMoveRequest.java          | 10 +++++++++-
 .../server/requests/InventoryUseRequest.java           |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/gameserver/src/main/java/brainwine/gameserver/server/requests/InventoryMoveRequest.java b/gameserver/src/main/java/brainwine/gameserver/server/requests/InventoryMoveRequest.java
index 88c1d2a..71684dc 100644
--- a/gameserver/src/main/java/brainwine/gameserver/server/requests/InventoryMoveRequest.java
+++ b/gameserver/src/main/java/brainwine/gameserver/server/requests/InventoryMoveRequest.java
@@ -1,6 +1,7 @@
 package brainwine.gameserver.server.requests;
 
 import brainwine.gameserver.entity.player.ContainerType;
+import brainwine.gameserver.entity.player.Inventory;
 import brainwine.gameserver.entity.player.Player;
 import brainwine.gameserver.item.Item;
 import brainwine.gameserver.server.PlayerRequest;
@@ -17,6 +18,13 @@ public class InventoryMoveRequest extends PlayerRequest {
             return;
         }
         
-        player.getInventory().moveItemToContainer(item, container, slot);
+        Inventory inventory = player.getInventory();
+        
+        if(!inventory.hasItem(item)) {
+            player.alert("Sorry, you do not have that item.");
+            return;
+        }
+        
+        inventory.moveItemToContainer(item, container, slot);
     }
 }
diff --git a/gameserver/src/main/java/brainwine/gameserver/server/requests/InventoryUseRequest.java b/gameserver/src/main/java/brainwine/gameserver/server/requests/InventoryUseRequest.java
index 8e1e413..013fc54 100644
--- a/gameserver/src/main/java/brainwine/gameserver/server/requests/InventoryUseRequest.java
+++ b/gameserver/src/main/java/brainwine/gameserver/server/requests/InventoryUseRequest.java
@@ -16,6 +16,11 @@ public class InventoryUseRequest extends PlayerRequest {
     
     @Override
     public void process(Player player) {
+        if(!player.getInventory().hasItem(item)) {
+            player.alert("Sorry, you do not have that item.");
+            return;
+        }
+        
         if(type == 0) {
             if(status != 2) {
                 player.setHeldItem(item);