From 6abd79cb64599a22da8c05cfba0cc3afd9de1593 Mon Sep 17 00:00:00 2001
From: dginovker <dcress01@uoguelph.ca>
Date: Sun, 15 Dec 2019 00:23:12 -0500
Subject: [PATCH] Fix inventory item detect syntax

---
 .../Actions/Logic/LogicHandler.java           |   2 +-
 src/main/java/scriptfactory/Core.java         |   2 +-
 .../Actions/Logic/LogicHandler.class          | Bin 3719 -> 3655 bytes
 target/classes/scriptfactory/Core.class       | Bin 3765 -> 3765 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/scriptfactory/Actions/Logic/LogicHandler.java b/src/main/java/scriptfactory/Actions/Logic/LogicHandler.java
index abf31f8..ed07661 100644
--- a/src/main/java/scriptfactory/Actions/Logic/LogicHandler.java
+++ b/src/main/java/scriptfactory/Actions/Logic/LogicHandler.java
@@ -18,7 +18,7 @@ public class LogicHandler {
         switch (a.getMethod().replaceAll("-", " "))
         {
             case "Item is in Inventory":
-                return Inventory.getCount(a.getParam(0)) >= (a.getParamAsString(1).equals("") ? 0 : a.getParam(1));
+                return Inventory.getCount(a.getParam(0)) >= (a.getParamCount() == 1 ? 1 : a.getParam(1));
             case "Inventory slots used":
                 return Inventory.getCount() >= a.getParam(0);
             case "Item is on Ground":
diff --git a/src/main/java/scriptfactory/Core.java b/src/main/java/scriptfactory/Core.java
index 81cbdaf..4180956 100644
--- a/src/main/java/scriptfactory/Core.java
+++ b/src/main/java/scriptfactory/Core.java
@@ -21,7 +21,7 @@ import static scriptfactory.VarsMethods.log;
  * Welcome to AIO AIO - ScriptFactory. Make your own scripts!
  */
 
-@ScriptManifest(author = "Before", name = "Script Factory 1.13", category = Category.OTHER, version = 1.13, description = "Create your own scripts!", servers = "All")
+@ScriptManifest(author = "Before", name = "Script Factory 1.14", category = Category.OTHER, version = 1.14, description = "Create your own scripts!", servers = "All")
 public class Core extends Script implements Paintable {
 
     private ArrayList<Action> actions = new ArrayList<>();
diff --git a/target/classes/scriptfactory/Actions/Logic/LogicHandler.class b/target/classes/scriptfactory/Actions/Logic/LogicHandler.class
index 3fe5fadff761804582c91b4000642fc782ca0b1a..6b4633e5e404f027321ac2f0605246ce0b82b508 100644
GIT binary patch
delta 1475
zcmZ9MTW}Or5Qe`qJCidGlT_Gb36YDNfDp1F2^fMRC^1|_z<>rq1c6l-TnvdO8x(Jg
z5Jf>QVZGsn1Q6pTDu`}Yg1iY;K3HY>Wci>kTE6*a`5<DSAyD9{>hAya^!$IHIbE}R
z!iDka@BTe=4!DJHJZ945v4WK@_qp8f(ab92R=c#AxW=W`<pGzqF6&$#bXo7R!Mw52
zBhEtxJ#5e;nuJF&n>;r2s3z%AVyL(9m_cnGTWR;`;BjvQPtfVnMarX_ZN@#RdCH@V
z?Z!Rr@eI$J^mCf$J*Lp)k~VRNk$b_QorZ6h#|(O0UUYfMz}=dcHLsldeU<X|1bDAB
zl38dSm|Mpz&0e2Z*{4v`#iE)$KKnV~bC6y|@sd<xYc$yvO}0muv~Nqar#d>f`y3*Z
zDGVKoyvFOAH+<gYEuX{m8q}LP6RKHX$J?5BeBR|fMbVb{ws=i<D%n=k(AgQ^zAV|5
z(j4*Wqu=K!8O<@D<Gimq;qw6lnh#C<Nb|AJCk$#n_4&;3f6hroG&4G{C{yd+Fs?b-
zmhh?Ll+PFRYEJun$yYvEX=9h&5E~-r^ELZ?&KNh$S)bdPtFW6pyAuj$QM|27817-|
z=|AnYDxAMLky;V&jBjo1=x$FbmR4kr=9Ogj=Uq6R(0$gr88RDY*(i~nCB9yEH4>FX
zr*a5&N`S>|@p(bAkXr@&mkYR!IkHox3-R)DXgQ8lV#P8Wy&uyH<f&O&tX6D|SW+x4
z_N~}YV!sN3WuNt0L$Oen!loRfV_Cv>KiVF^joFes8els#n4>7Dx|$fKxV2KgOeDvc
zb4RX}4O7xO#Mty4J5=vP9K&~vv88q_;s{%g(kwT&^f+qZ(r=}9j&V80U!Y(FPB?#s
zCdb4qHwA*nuFFLShbe0fT8kORA<DB%y1r19(;{u!KTf@yV{%X`=PC+#Zw|`)h}d!}
z(Yd_u$FT={9B1It`H+ZAkz-5^S7ezcXQ-5rC6=QqG$<d=4z6VrrGmr!LqtucM9rd9
zEhVa&DO2f<l&cN_-AqzDnXC><>}85NL4_KmQhiUA`k89=3$^MGW~jfIss5(k%44?W
zQe_n|$0}s5HH|xhd#}S$Elgyd>>ZJq$DPc_RzC;|a^~horb18)4csMz(I_3t$c((O
zKssM2nKewk$U4m;l^?8vQMIk=l039Ei#2zfCs<15%~uqN6^UJBlx9h0Z+>}Nrd+7a
zz^;@DwImi+%14@h7&lx!fD^7cDY?)!v)dS)Va(;)D_v4J(xhogW92u9t`IM~O22x9
wK4R!=!_`?_(O4U<F(TFf7g>CbNaU(W<a&{CAY!pxG%fCx|1@|aS}al4fB$<37XSbN

delta 1501
zcmZ9L*>e<C6vltI7j9S6NyUi`i7bXaWPl8dK_e&;1u-aLXC#0lh8PS%lL-ng;}XS{
z2xCB8Sk)*-0l~>g5VtC*;*}~N(Fb|czd#Ys?F0(ERcF2De&4x$PoEpUeMIK`zo*Us
z)A_|`28(@`u+(Fj$8w()tTbwsN7C4bJyv_vd#v$T>#@$`5s#EP@u<&w9y4Bp#|9HL
zY999qY4X{~6Pjk9l793}J}qoE;gdd3HPY(SM%t&HEj~~4jL%lK8TG8@IiE2+Z`2Du
z8D2E$mozW?l(X356=ORL?W@LnP4L+6%Uxdgc*EmO<G!VNTl3EGi_4Y2Bl0_?o9t|>
zv#g4ln$CcC*{M*IMancg0(OxNc#p2^pH`{8n>|_2-c|BGdo>>fe8@)uAG1$^3A(aJ
z?aK94?AII!ILIMI@y67aRAqa*skySIwKcVMVN+W=;4od9PXa#Wvw&{)Xg&}4f+LzQ
z1A6#M^R=-@HOB&u^Nr?2z)89Sz9pw9%PKv5*s`YPhJY%11M&v%yMR;l1)P>X+MJsB
z_nZm%ft>+A8ub%D2h8R!g|n=+y+Ps5OEtF%!a^QA@td<+4Jm4DNY|xWQ=4kqmZn>q
zS{fB$`GV{^H&nIR&8j3@tBSK*2AwP{xLP=Ob9+nrM7cg_)lZj!G0Q<oPcuc|E>Wde
z`8c>0y{O~jSll6cP?Rj9TKu5DfIFEbkuoicmc#ZET&cuLWXJgzG7DtaEG?1{StHUS
z(jjtQ<f6zW0npBAKWWG997T)r+!S|m#A3xcyuE0<8_y()4x*iI9J?pa%~9#KL?2<Y
zBHqi8JVVdyyIR&qrX<-*X|-clxuF}+amyh}N}YJ<3R<3FIfk$7a8>t}OQlYp5qU<Q
zqj12z_3TxcJY_jXMTCcL$c^slV@xt?Ep8Bd8JlC=^@SO`r=Qxif0!yS&-kd+IY4oQ
zJ0U9HPw2?4gr`3~fa~;hxNi5Av$l|w%Pl6xDssf-4wJ;>n4D*d-6LPmiQZ-drQ*l<
zhfqyqsH&z^)lrsFNk*v#Mys^gZH!Ud8LPU)?q<9?Lb*I|g}T5b^*dA4A0*UYOjUm~
zO<ktS8q7?qfJs&{)mF$XYl=LwdHfl;s-BVD%^dNP^7u8}gQI>GFUpzck4B?js>Pkl
zy)qs5Ng#7GaA2NvK3_7cm~feT&Hbt%T7`oXYt<FmbTkVz511V+r3TGW6p9p!TxPJQ
zHd|XTIwSvqK%1#uEMsbkEvk^uQ@Ix}mgvTfO+6+#`?>+18{J_@f9=2k%c+4TO-mZ9
zphkEF_@Qg?D+b_013xX6h-TAU9h+)M68|Tee;rA9jU>F0Bo>iaED}zOI&Kr|3u!1;
F)_?w$5BLB8

diff --git a/target/classes/scriptfactory/Core.class b/target/classes/scriptfactory/Core.class
index c267610036a07f0a7025611f63ddb0631e5eb67e..1e16cacf93d1ef40982cd6916030c78fa3131ba2 100644
GIT binary patch
delta 25
hcmdlgyH$3B6APosWM>v%Hrs;5*STyrPh*ki0sw1(2jKt!

delta 25
hcmdlgyH$3B6APp9WM>v%Hj%1_?(0N0Ph*ki0sw172kHO-