From ab572abe1027d7dc1ec9a2eba8c7986d79f9ea2b Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Mon, 20 Oct 2014 20:08:43 -0400 Subject: [PATCH] Updated Jupiter version; OnBadRehash() added to IRC_Bot. --- Bot/IRC_Bot.h | 5 +++++ Bot/Main.cpp | 2 +- Jupiter | 2 +- Release/Bot.lib | Bin 19582 -> 19858 bytes Release/Plugins/RenX.Core.lib | Bin 56672 -> 56672 bytes 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Bot/IRC_Bot.h b/Bot/IRC_Bot.h index 6e07ea6..c0700d3 100644 --- a/Bot/IRC_Bot.h +++ b/Bot/IRC_Bot.h @@ -103,6 +103,11 @@ public: */ int OnRehash(); + /** + * @brief Shouldn't ever happen; returns removed. + */ + bool OnBadRehash(bool removed) { return removed; }; + /** Constructor for IRC_Bot */ IRC_Bot(const Jupiter::ReadableString &configSection); diff --git a/Bot/Main.cpp b/Bot/Main.cpp index a9c9991..cf2f119 100644 --- a/Bot/Main.cpp +++ b/Bot/Main.cpp @@ -133,7 +133,7 @@ int main(int argc, const char **args) while (1) { for (size_t i = 0; i < Jupiter::plugins->size(); i++) - if (Jupiter::plugins->get(i)->think() != 0) + if (Jupiter::plugins->get(i)->shouldRemove() || Jupiter::plugins->get(i)->think() != 0) Jupiter::freePlugin(i); Jupiter_checkTimers(); serverManager->think(); diff --git a/Jupiter b/Jupiter index 5850b6f..8273d51 160000 --- a/Jupiter +++ b/Jupiter @@ -1 +1 @@ -Subproject commit 5850b6f7a472a3ee801ba9a7281494ac7564dba7 +Subproject commit 8273d519ae8615019152e30410c3b27c65ba40cb diff --git a/Release/Bot.lib b/Release/Bot.lib index 6e7fae3b4074df9dbf1d67e07e72543b685f0456..bae60223dc2d8278bbda02ad426714bb6ad131bc 100644 GIT binary patch delta 2761 zcma)8TTGL86#td`#S2)ZEg-a(o3_+mD5W>raw$+yoM9O=Dj27UH!xANC2j$eEiqfv z!AT5}M0whLFfocVS!Oc#=6vw72V)!$vIm#V8I8*lO`Pof|Nnk`NVa4oKR!6Wb3do& z>zhf##FXL7itJ`zAmACdnMeI@pH==06#zI0IL-nMR{_^!AjYD=7|`)T!S@Ida9>dH zp92KkZiV0g5WLAY&w*5_LXQg&NL^8An+610PY8_iKh+BDAwZyUi-M;NkT}IpMtD}C ziRA*3`wD>^4#@DnRPYURl8okUjEAhVRiSBu?HHcd3ZWq&G%9{QPzdki0F0iC3Y|9q zfy8Zv_G_FVql2pyh)pU)`EP+n))nv`Q0Qjf?^NjJr$F4LkVvvmMlybj1&o$G3Y{Si z%1EA3=$&RmMi*Bk(7j9{%H0sySRp|7oXMF`#*cZKtvf%U;})ZFaMR$X_*M)K?mc*D zFxEGmmS+h$B`ndIP~ql+MQh*Fz7;E@lwz{5W0R|6ji z0yi1YnJ-Q8()0jV_&MDMoM;8A`59^lwlo4|9^e#XHq3uF0rxpj4%@x-0;9w1cv~~@ zkg=7C308Q`%0t|W2aJ7ebdjCk=mc&jfNSh@fD@YJs@xmb+`xRDPFY$%5v z)u@3PR+PbsF#K@9i$?fRk5w?D7$sPT^~ga0O{hZg*FV8fCSnILOc)y$OXqCr~*IrN!?CZJ@agW%RD6N~77vZIrZ~=?sc_O6g5*9{uKCqpSStQ*MKvur6F3P{OZ0 zQ6;3gh?xvtB{g~9*Huq?jfEnES`LweEV`U;qIqi`-SX;ZkuuXkEWVg#DRY+veW44@ zq^0w>Zy_BM^*5GC&Har*&D<<}E)#)m9Jml!pyM_Ry=qLCMsp!EeHc~=cl*0_JMN>j zt7E(6!tPRD6+QK9cAg%Gj1_H4C>!Z%s!4ge+|;Ri(z@gbq`Ne3Gts93mFrX>ovXAT zX;${R%{_~}YSPa%shIQAv}$H>k=JcO<@IoIw{BnKR!7Ea6>ppQc|L6h(UE$ttduKT zdZ*^1>D8d(E;IcVRJ*}<1tuyEEzDF-M$S}hm6>PyiKU!wgwpfmdK_|fU35BJLFeqn z)DqS?*>%Y~s4!xoyOv@KN3`yWsr(sMf%zVxoK{BCvym%yG-8ytJ}QnHX*v?os*O10 z(D*p=CE=m9RD0-q&8_JB_0|%(>U=IyN#~s(yXoov>@?Pz z4xH|X%sE9PZFRIcXDwB>Et!%u=T{TzrTLk*Mdm-XsmNQHUPsT`_UdULX;&2Ad#tDN z_C=ju(V;5pXUZWex?9)Fy~?9Mq9wWm){?39(@4@yJB*^8i&W$yyq8qf@yiDdbf?2f z=aV+w#cWdLu$^fay-FU{sn0u=_l=b3T1ST}7Z0nr%OMwAyp-L%*gH!6yhU%t=FalR zQnrTQ*znN3u7!JRB5${f%kMmRsjvIL2I6DRPAgIio3O-fqvZRlvgve6+oa1Wwd4GS zfZv7Oym!{uQ&EpLG(Jpni~0Kc)&Ux`M4&m0rVS UGn3y{Rpz&j9C7XbXg3P}0Xlb;cmMzZ delta 2688 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 o86bBaKtw=M z5)}~;FM-IVOoSA{ONPjV&9=5y;vcRxOFPeVzH{E^L;mBu=kojg&gFf-!6uu*CYxN> z=NI}d@Lm)k>WZD~1N=g@e;YDFqxk>fJg5BK_M>Z#gs!%;wz3)}B2uS_^0X-prrjOZ z6a-F_eEfXe@h@h~3hU>rWW;%qoaQDzO#NMR6d$G8+rYzy9ci<)1kPekro&hnG{;K* z*^0=q4k9{kv>4tqUPM<;(o-zn<0w;z$UPy3*>jwXo)59lS=m~N`nbs=AzX$}H+-Ch zSB8V~^8`N|^m7#nP$GD*qwbg0MDb8rpHIS-JJmxbKz+(k>SA!WX^$Pw5uKk%^wb}Prt1{aHF?JV?E znfK*I8U@ibHD41JO=X%X-|QvUa3GdcqbN%{3hx3((JBIThX>s#=c@%KGVd(FR5b-* zWEwVS_bBA-gtVqmLu&NFyGZMUlgKVY#l9;F z%y-4Sa*Lky)MA~S{o9R5GzFGskO|I$_^lMhd|bMp%(6zw1uWfJmP%%c2q>x2??CC9 zP&#{s2}<+CNSE?k80mFjhaTB=0L}Lfuoxs;#zB@%u0?L8quSmGsNpHcvUhf%__LBX zO2TWdz-+x0=|&OcmvxAz#UYh8&bWBg5@Dw--tOos@Lo0pc80b zb7BLTVfz$ue;~dThqf7Eb|;XG%tzX59`oiwg50KIn- z&5us5qa>6!xt8-1@&9U>cwMoJD5^t2tLx$^m^>ru*;9f7hUz8-0i7@rSwCO2ZM79~ znLL!FWBMu95qhuqz1WaQ*>xiI4MZgWG&;^b&4B56RiEbLMaX>5Ffz$u*&XvxoY}@z zK$op&QJ3_yoPci6gmZjkB(<`0xFEqm%>#$5x1hWaH}Xwzc}q@tyKk`Q zZe<^{LW=Fs_dEl7HxnDVn(;E?J}BCwV&VH=8%TIfWAH2e0-5A3P~9UFJD`TNr9lB#WqmKTidu{!+AIt;qCku9qhujS_=GPfM4urFIX$15!yM5 zm4$-74AZA{7$$?>o`3&fB8-w~&o3xT(vLi?G{93YvPo}L`$cXPtz6VkJi#MJYa^ho znCPo_L!zNM-FWF4+7B)z3DP588v6G$qXy3jkhi{}k`f&2Y)6bVVDeb1UauCSLB@!y*`DfL(4DVRizyvic# z6L{?^PoP==^G8r(cPu3^cUQeUePBSoP^;=cLwr_dObBqvtHjUa5b#MtA9qoAZK0lr z?&{>8k?N?k?ggRSp`+fTri-gRbOqs%sp50t=~puGzyvoD(MylvXNa*-6}?PH>haoj z{E7~T(61q}TlC_QuW5bu`mgisnOQ4XlJ!oAwx8!A4&GqWGLlyF(G6oYwQb0|sZEt? zk4k8Qgej2Fby?_0IP%=Uw~lg)2DfjNo13_EYppIMtQ$9Ex71{4*9;w-dH0mhYDn{~ z^fCD@w^$Uw|LJWUnDpCx2hFq;f)x;&W@VedAZTRZiCTZl81rIZ648C!6FKwr zOJYf%#V-l{>}N<=?kU0INgvB9p~LG(y%^U)_Do^j4