From f963baa65e872eee709612b79ed233be9133002f Mon Sep 17 00:00:00 2001 From: Ceikry Date: Mon, 23 Mar 2020 18:43:33 -0500 Subject: [PATCH 1/2] added GE autostock items --- itemstostock.txt | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/itemstostock.txt b/itemstostock.txt index 31341c6aa..d7b0e405d 100644 --- a/itemstostock.txt +++ b/itemstostock.txt @@ -2,35 +2,34 @@ #format is: #itemId:amount:price_increase_percentage (as decimal) #Weapons and tools -1359:100:0.9 -1271:100:0.9 -1275:100:0.9 -1357:100:0.9 -1333:10:0.9 +1359:100:1.9 +1271:100:1.9 +1275:100:1.9 +1357:100:1.9 +1333:10:1.9 #armor -1127:50:0.9 +1127:50:1.9 #ores -453:5000:0.7 +453:5000:1.7 #herbs -199:1000:0.5 -201:1000:0.5 -203:1000:0.7 -205:1000:0.7 -207:1000:0.9 +199:1000:1.5 +201:1000:1.5 +203:1000:1.7 +205:1000:1.7 +207:1000:1.9 #vials and such -227:10000:0.9 -229:10000:0.5 +227:10000:1.9 +229:10000:1.5 #food -379:10000:0.65 +379:10000:1.65 #potions -2452:1000:0.6 +2452:1000:1.6 #secondaries -592:1000:0.6 -2970:1000:0.8 -6018:1000:0.8 -3138:1000:0.8 -223:1000:0.8 -6693:1000:0.9 -1975:1000:0.9 -225:1000:0.9 - +592:1000:1.6 +2970:1000:1.8 +6018:1000:1.8 +3138:1000:1.8 +223:1000:1.8 +6693:1000:1.9 +1975:1000:1.9 +225:1000:1.9 From 8b7fc4e196ae82ff20680c01952bf9aa46998e17 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Mon, 23 Mar 2020 21:20:05 -0500 Subject: [PATCH 2/2] Burning meat hotfix --- .../src/plugin/interaction/item/withobject/BurnMeatPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java b/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java index b59df1072..af75b1d4d 100644 --- a/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java +++ b/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java @@ -49,6 +49,7 @@ public final class BurnMeatPlugin extends UseWithHandler { for (int id : OBJECTS) { addHandler(id, OBJECT_TYPE, this); } + System.out.println("Burned meat plugin successfully initialized"); return this; } @@ -62,6 +63,7 @@ public final class BurnMeatPlugin extends UseWithHandler { player.getPacketDispatch().sendMessage("You can't burn this piece of food."); return true; } + player.debug("Used Item: " + usedItem + " In inventory? " + player.getInventory().containsItem(usedItem)); if (player.getInventory().containsItem(usedItem)) { player.getInventory().remove(usedItem); player.lock(3);