NBT fixes

uncovery · May 22, 2020 · 0d0b8c2 · 0d0b8c2
1 parent addc302
commit 0d0b8c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/inventory.php b/inventory.php
@@ -36,9 +36,7 @@ function umc_check_inventory($item_name, $data, $meta) {
     $inv = $UMC_USER['inv'];
     $amount = 0;
 
-    if (is_array($meta)) { // this should be always the case
-        $comparator = 'nbt_array';
-    } else if (!is_array($meta) && strpos($meta, "{") === 0) {
+    if (!is_array($meta) && strpos($meta, "{") === 0) {
         $comparator = 'nbt';
     } else if (!is_array($meta)) {
         $comparator = 'meta'; // this should not happen anymore

diff --git a/websend_inc/depositbox.inc.php b/websend_inc/depositbox.inc.php
@@ -594,6 +594,7 @@ function umc_do_deposit_internal($all = false) {
             $amount = $inv;
             $amount_str = $inv;
         }
+
         umc_echo("{yellow}[!]{gray} You have {yellow}$inv{gray} items in your inventory, depositing {yellow}$amount");
 
         // retrieve the data from the db
@@ -635,7 +636,16 @@ function umc_do_deposit_internal($all = false) {
 
             // provide feedback
             $log_text = "{green}[+]{gray} Depositing {yellow}$amount_str {$item['full']}{gray} for {gold}$recipient";
-            umc_echo($log_text);
+            // umc_echo($log_text);
+            $text_data = array(
+                array('text' => '[+]', 'format' => 'green'),
+                array('text' => 'Depositing', 'format' => 'gray'),
+                array('text' => $amount, 'format' => 'yellow'),
+                array('text' => $item['name'], 'format' => array('blue', 'show_item' => array('item_name' => $item['item_name'], 'damage' => $item['type'], 'nbt' => $item['nbt_raw']))),
+                array('text' => "for $recipient", 'format' => 'gold'),
+
+            );
+            umc_text_format($text_data, false, true);
 
             $sentFromSystem = umc_depositbox_system_UUID_check($uuid);
 

diff --git a/websend_inc/shop.inc.php b/websend_inc/shop.inc.php
@@ -523,7 +523,6 @@ function umc_do_offer_internal($deposit) {
 	$item_name = $inv[$item_slot]['item_name'];
 	$item_type = $inv[$item_slot]['data'];
         if (isset($inv[$item_slot]['nbt_array']) && count($inv[$item_slot]['nbt_array']) > 0) { //we have nbt
-            $nbt_array = $inv[$item_slot]['nbt_array'];
             $meta  = $inv[$item_slot]['nbt'];
         } else if ($inv[$item_slot]['meta']) { // we do not want "false" to be serialized
             $meta = serialize($inv[$item_slot]['meta']);
@@ -533,7 +532,7 @@ function umc_do_offer_internal($deposit) {
 	if (!is_numeric($item_type)) {
 	    $item_type = 0;
 	}
-	$inv_amount = umc_check_inventory($item_name, $item_type, $nbt_array);
+	$inv_amount = umc_check_inventory($item_name, $item_type, $meta);
     }
 
     if ($inv_amount == 0) {