From 18605efb43758f8059ababb807ff60d9dc530ae6 Mon Sep 17 00:00:00 2001 From: aappleton8 Date: Sun, 23 Sep 2018 22:11:05 +0100 Subject: [PATCH] Bug Fixes 4 - Fix some 'NullPointerException' bugs. --- ...yerSlap_vDevelopment-0.0.0.5_1.7-1.12.jar} | Bin 43870 -> 43936 bytes PlayerSlap/plugin.yml | 2 +- .../CommandClasses/SlapInfoCommand.java | 28 ++++++++++-------- 3 files changed, 17 insertions(+), 13 deletions(-) rename Jar/{PlayerSlap_vDevelopment-0.0.0.4_1.7-1.12.jar => PlayerSlap_vDevelopment-0.0.0.5_1.7-1.12.jar} (80%) diff --git a/Jar/PlayerSlap_vDevelopment-0.0.0.4_1.7-1.12.jar b/Jar/PlayerSlap_vDevelopment-0.0.0.5_1.7-1.12.jar similarity index 80% rename from Jar/PlayerSlap_vDevelopment-0.0.0.4_1.7-1.12.jar rename to Jar/PlayerSlap_vDevelopment-0.0.0.5_1.7-1.12.jar index 565af2d9a1964ef525483ad88fba6eec1c807a02..5c1daf5833954926bb6bac0e123800c813a4fb52 100644 GIT binary patch delta 6244 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 L=$@fU{+s$Qejw9_ delta 6205 zcmYj#WmFVg)HMtsjSSr&9YZ%bv~);!Gc?i-4&YEj2o7D+Idn_6NSBCor_>-ID87Er zkN11eT6dkj_uA*Kb?%>Y*C|{EY})(z}vrlk531y zjJ;u){pukmQ3(yKb>csVTfD(5w9p0R9J8b#3k@YR`y7`OM})+wCIQWKBj$746Cw`- zH@HiDQMnd|^o^H#)cb~hRU%Qs(!le?@|;02zZjFpEC%h0MAiXu5{>7tNMYr53T?El z&dfu?fq7sL+r=zFky7EL6-$c0e%v%}Bu=^+B@>_QIRlj#Um%aFtJ6@;T2RJ0QXm+Z zd_wWga8602HD}fk3LiA2aQ0>#Sa4PHlU>Uyw;=(5?Emca(h!&Pq%b8^P~*97WeOxT zoEfm)*^3>hO5_Xh9%lN-02f+eQJq;TDax%TW}70P6HnUt&$-dvuI$+jUaV8Yo@77X zLL^plK2{Y{;MuAhixdS`KzA`hd=kWn7jPr_Sdb$REe;011Bk#?+m&iKhIg*Il}#!f zt8-to1@z6BCt>WXf@#u~f+R!|whg^CJ~(%Hq0P$aFRojEXtAvj@EWHv@NV$gbGbP* zHM|wE?Sw(Fs3AjKCXv4P7JX8+Ba_obu+&9!Q3RVzZSTuDU&#VxC}T63HXiiIVtVLSS;JsFCtTchHeHu(lMP&A4P12LWl=Sky0>O|3m)F& z^&X2_`n2=;NaB$n_IM%$0zEIl5P4t}7GQNm;aTobXzD$bbX%5_o9whrU{fwYpUa+U zG`Wdh=>x}Z1_`%pRh6w}dL!bvIy>$?k17u1QVyty1xavDpuc=-1``4G zHHVYYv?WK2>f_B*?a%ka9W?tcOMj2;Bmv26LH?PknuPc#U6KR}U-_w*8!|(F?o}2T zBmwi+`v;+83y$!z?H%Wn>iqr_oB25NY8=3F;|s-i${@!x_4hEUBvK=tQinCU%I0-@ z(z!v~aMtvZu6W+`AyQ(oh(z=Iat;@zdE0dZ`?;cRgQzk}iH}=0&mlSvYt!oi%@pzF zT1!+0Qyq;6NQ)rv!a7%4b24OYijXr0hjyG*njeY~e7lzL$hM|p;`d>ImF^C$2;~6x zj>q`IR+MS_%x!RY5;7aXH zZ4m)7T4E>S%e}~$9u%4@Q(0#3{)Yp%!c%zugb!R*Bj%t)Pi6f0C|yiP&CDZHv*mmL z@)62h)vRe7?g3KnDAXhkAD&S^0Kg(=8rJ4S@H%4XUTYI7_88t!y~H=W$t3a59=gZr$*bw@%$by4%-0F7;Y*vu16Y2FQv1xR%8o@-W50nl%w^T-^cj zD;i@VigUg2yc$m?=@Uq6%9Rv{`yjDV)d+2n{$P7&GzA*hy<7K)U$J9XL#$}+8z^Nz zv}DWk%Cb#g1d_=osCD3b0Q)EvnFq<0O3!Gf%!pkuU;XaqDXmHt6!1k8@;pMF(!G+rrxJ+_BXM| z9)*GWM*A9Ka#vSPvg>@9jD(+z=b$rxYb%qC&-Ajz_;xot!vbgn?#&gdXb!`a8275g z2T%SadwtEY)x{p}bhZ!ZabylwovMDl3&w&H4~BfTYV)s6{A-8L3nBSy|HFV8+u?U= zI_EU@V|&)cd#-!Zr_3?A`Gtv=>Ttgxv6E zsO+pWQw@lCh@a&FdZr`riy%8ajT!z^EfU#55QEw%y~;q5)|oohg+wKy#8OQvVVGx>s>7vt>J8 zN4tW}L8oLnT6RO~M%UKe3$ZLXRuo*17iyYIbmTX(87E_!e56ADV%nJ$89r4>ASI=+`KF4J z>j%JsryVOAe{Xw@`aJwL27ba;$m@K`qs?Jf{|>y>jz4uSaor zq9N)5IbJaq4^(ddF8?O}dnlPMJIFlST4D}jC;ncdo~OBKIREj?UF982cvwIjnRF7M zD#`SVC0}#M;uQX@K?oUeDQ7*&Ee;3HMBq;(+CiwV1)2(9x59Lj**uk+n?WNQG0cBD zs6kUF98F$O3mx*t)(;llh2F?7=_;+*H?D~)sHq%?yIGLX6-{gL>m|fCFOc6H<%3lx zO`q_SN|&h5;W6v7N3;~Ue1^qg#YZJD$z}K>`uV%zVcMDxR^ygt8bt9MuMY@`t>N*? z-M_i>rnBfM30rGE0RW&A0x9$1p#J^0tY37cT07*SsAw)eN3vc$d%DBc@7d7+BzL;M zC~5ZMM8dB28w-jIr90ox24Zlf?!br8BtIeKs-aiNTxe&?R+Mo6&Q)KgEOmw&JoLGmHSgk`P;8l$6S zde>Ai@*LN_KyH)aA*`gMal0-{?(cr&r9AYAfRf6Q6I-I;oh+V>J6&v9qMeE@!~q z*+|RTz`LFP=9&1&*jlQNmE_3vq)3%~sv}u%0+FX|yREAe8ky83fy=5eg^$_&`fSja z-q-nGGr4CUd?d|g3@Tdd0kwUcrT%!m_ZkzFcdNY}wSt#Xy9wXo!@URou2LF`gmaDI zs1Vr|uY?NqTl+H(>Qd(PgaX}fA%;&GuREthaiFh)06OrB3*wxzo}(HB(RL`T#M$-M z^kMNA9oyS1@@~*fAS}7pC!0z22?nL6|2uD$r_VXWC2`<1C>W$~FjH~qnu-OG<)1b5 zcaV*MhN1rziQL3|o6E1Ge6>zaf6Hi?m*!MkPU2=t2j!P|aw-7hO`XL<9 z0G_7`+Qe;JpA3!k`1U-f$A4p45bT!zoL4y2>M-Bt1-#?gcs_nBQ*Z)`OBJfeUQ{`H zWtT#>t^6@su+t7mFuy2N8A*3?6Sl}S#hL7u!=_ZwjJ-_pz^;nVO&Lskj4Uybl_yjY z42{ajz@y;C?m=RP@Ml0I7bGbTQFwJcFsl^42D=Nj37w!8LDi|Y5-&Ry`9PT8p%0sC zjnI{$yZZJbscAF3u%vf6X=+4EjP`g4`p+%z`pA+z~VTV*f_XgKn2`)cws;Ll9Bn$ zurRd3=Cd@VZaqAIgLr2HLUmOaacr5C)=uwo@$Br{l?tUSa85t`<|3(MG?cRLC&P&U z2IEf1#bd|x;h>hx^EW?#d3EteNQe1%ER1Db@{XUS!C zyLIacQ`dj>+oFYvif`qL#$K9Dh2CfM0qY+XgNFL>JRgjArJqFa3tEHMCPHyMNwTMg z`jTa|m*b}1eXJ`x4MGv?EH4n+DQ;KL9`C2?xlugH@6P`TE6Eau{I>)?)qEl?s}bn z&cruyBVQ{1h>9?we)pbBA5Bfdy7-Y*MC~R5CVn3=T0wW%pFUxselO!ikoz9xddT|; zyZpOfrg5qCp#+Egt4~Q|l8`S&I~c@&aNSs+O4GxhR3>v-wZC4CV;{Aqh2+XopUF2$ z%q#xIeyxFxhvUcb63gZ}8X99W8Biz@Lq3lap_UJV{#XD4UPSknrnDU^;ubl31oPTy z)Uj;_jPG{^Dt~BgGHz<^odAA5S1jnl&=`2iDUZ~V*=-{MPVgu?SayEpE-IPOaFZx5FM$hocPM*o~thCDwk$cCa&hdR0kt~m# zcw|vC#nx;>7V{IdXUhHU@pv~ERR)O7-Y3yZ#aM1l-Tr`y&{fS9v-&paJd>YjJJryq z$1lfg@)P9Ei}&?7>&i2MUx9(f=sXp?w1*><)Ie`P2s)Res*n4?i-^j80r|{aBJy*-lOl+IlYS|GhreEJ_4Ik48IlfGK)iiI&%xyR{a=G3+Ei z8Bi$b*rjtHM1<ll9qIS|Nb*N?}&jBFx0!ucGIhjvG+T@&Gl36 zpM3(|X5CJF<-7%zj{|WBynI&}q3k9)(A+rj&R4{!fxdP|od{yoo{CMp=9%JN+cb$`k9 z`0z9>f2_mD#fDJHr{8DB;4tztFFf@bGu(%+%?eJ*BBH(NvY}~D$T&}OsO*+7bo6@l zWgLAWlcrs~FykgQAx3qVi>4@rp2VZaHvW)AJuX|#(d>~lv$XW<#cr-pcDl!S zO%&r-i{i(~S2&=84fWSW#%k5TH9b_h44adOe^<1LtI-i_wjDuOS`IzT*ACwAcnLs1 z&y9AO9QKkr7)eBXc9kP0jIjCvy=IzbNz2+SFETyT4K9JJt&4GwwAyKr8?tBjQ)(2W z&SCIb>Ixz7Ef;OxZb(U1=)A{5X#aqm+ae-1#3#IbHK(Sng;SK*(tZ##UyR*Fo`Q%k zd8F{nVfH*`-&<{mz)lY=K|VGsx9(dW){7O=$v~g-$NSQ439h`M^-2W#XBNXIq9zcDRg&UCt%UE)I1D5N)`wa)2WV}K1N5vIzE<+jcG*sn{M zF0iKFHN+Rw$y6bBOnL)d^Xj$vP8aKr>S_967p|)my@@^T=gV5B7VwrKN$ZBiA>3Lz z`$u65PahkP98Td^v%jP1vU{Tx5WMlmrHUMz0L6|Pj6*d93wXs0eo9GgD83m{641`(~mkX zW6RFy9>y~X9P`}>4&v_v!(2i)Hb{ATPrAVr2zv}FsJn5@rz!P<}Tqf54EnAgtWXSt% z&TeI9c2^uew>9-W~&&Mi0!s5Gd^Aeu0XDUrs`U2^3Hy3W8_Jd)JF*H)`eS;zSRG zNA{1$rt;+CJzUjCSq}*QSwimJ;lLOp+}Z$xE4wHxK7MHX;&S$E&YbdcXM}4(txvpt z(&9B-b==x&_A2-2oEsJkW#u`AQm(*HXHucTlmy|1l^^hLylw{!e$O=; zn@w+it_CvRx?D^2!e$;uytZRhX=*8EvH!Ve8%6(e*zk40tL;6nEEvQ=bst z)K)5Et8bp$@?(cjgGqs?Ie)i^H^?pWh?Kq-eG{qcfj1``u*xJkDMEGFT_{z1(g=8; za9tFnI{WhWn8jFxOar?%F)w)t#cZe`++s%Xg9u;cr!!{`tB1mldqVD0sQ*W7p*0qN z*dx>$-Whw~X9kj9z7)&f_|DUr;^g2<(tn%kXleR*sBUQ|5P7I3Iw#A0HI&O0BC;sPZIc#*8ih83jaCID-;1p^Z)8V7Q_hp ze`cRb26THwYNaXQ!3lBpFR}R|KoN9^0$*xGSQR&52KtZkBbNWc&cuHPHUww206HJS zv|1cJACX!OMwdm*R7;>oBXDYDBrx;P(D=N3JY6C7e*d@Ke;*93|N9hp|62b4@tB8r NTSNB@R{H;>{{f`9w4eY0 diff --git a/PlayerSlap/plugin.yml b/PlayerSlap/plugin.yml index 0f13c56..68da8e5 100644 --- a/PlayerSlap/plugin.yml +++ b/PlayerSlap/plugin.yml @@ -1,6 +1,6 @@ name: PlayerSlap main: me.PlayerSlap.MainClasses.PlayerSlapMainClass -version: Development_0.0.0.4 +version: Development_0.0.0.5 description: A plugin to slap players author: aappleton3 database: false diff --git a/PlayerSlap/src/me/PlayerSlap/CommandClasses/SlapInfoCommand.java b/PlayerSlap/src/me/PlayerSlap/CommandClasses/SlapInfoCommand.java index d6cfa4c..263eddc 100644 --- a/PlayerSlap/src/me/PlayerSlap/CommandClasses/SlapInfoCommand.java +++ b/PlayerSlap/src/me/PlayerSlap/CommandClasses/SlapInfoCommand.java @@ -144,7 +144,7 @@ else if (args[0].equalsIgnoreCase("player")) { String sid = pid.toString(); s.sendMessage(ChatColor.AQUA + "The player " + args[1] + " has the following information: "); s.sendMessage("Is exempt: " + plugin.yd.configuration.getString("players." + sid + ".exempt")); - s.sendMessage("This player has been slapped " + plugin.yd.configuration.getString("player." + sid + ".times") + " times "); + s.sendMessage("This player has been slapped " + plugin.yd.configuration.getString("players." + sid + ".times") + " times "); if (plugin.needAcceptPlayers.containsKey(pid)) { s.sendMessage(ChatColor.RED + "This player is currently under a slap "); s.sendMessage("Player must accept slap: " + plugin.needAcceptPlayers.get(pid).getKey().toString()); @@ -172,7 +172,7 @@ else if (args[0].equalsIgnoreCase("times")) { plugin.ms.sendMessage(s, "noplayerconfig", null); } else { - s.sendMessage("The player " + args[1] + " has been slapped " + plugin.yd.configuration.getString("player." + pid.toString() + ".times") + " times "); + s.sendMessage("The player " + args[1] + " has been slapped " + plugin.yd.configuration.getString("players." + pid.toString() + ".times") + " times "); } } else { @@ -187,15 +187,20 @@ else if (args[0].equalsIgnoreCase("times")) { else if (args[0].equalsIgnoreCase("general")) { if (args.length == 1) { if (s.hasPermission("playerslap.info.general")) { - s.sendMessage("General " + plugin.descriptionFile.getName() + " plugin config information: "); - s.sendMessage("Players can slap themselves: " + plugin.yc.configuration.getString("slapself")); - s.sendMessage("Default slap type: " + plugin.yc.configuration.getString("slapdefault")); - s.sendMessage("Player slap counts incremented on '/slapall' command uses: " + plugin.yc.configuration.getString("incrementonslapall")); - s.sendMessage("Slap accept broadcast message: " + plugin.yc.configuration.getString("messages.accept").replaceAll("__Default", plugin.ms.acceptSlapMessage)); - s.sendMessage("Personal slap release message: " + plugin.yc.configuration.getString("messages.releasepersonal").replaceAll("__Default", plugin.ms.personalReleaseMessage)); - s.sendMessage("Broadcast slap release message: " + plugin.yc.configuration.getString("messages.releasebroadcast").replaceAll("__Default", plugin.ms.broadcastReleaseMessage)); - s.sendMessage("Personal slap no release message: " + plugin.yc.configuration.getString("messages.noreleasepersonal").replaceAll("__Default", plugin.ms.personalNoReleaseMessage)); - s.sendMessage("Sender slap no release message: " + plugin.yc.configuration.getString("messages.noreleasesender").replaceAll("__Default", plugin.ms.senderNoReleaseMessage)); + try { + s.sendMessage("General " + plugin.descriptionFile.getName() + " plugin config information: "); + s.sendMessage("Players can slap themselves: " + plugin.yc.configuration.getString("slapself")); + s.sendMessage("Default slap type: " + plugin.yc.configuration.getString("slapdefault")); + s.sendMessage("Player slap counts incremented on '/slapall' command uses: " + plugin.yc.configuration.getString("incrementonslapall")); + s.sendMessage("Slap accept broadcast message: " + plugin.yc.configuration.getString("messages.accept").replaceAll("__Default", plugin.ms.acceptSlapMessage)); + s.sendMessage("Personal slap release message: " + plugin.yc.configuration.getString("messages.releasepersonal").replaceAll("__Default", plugin.ms.personalReleaseMessage)); + s.sendMessage("Broadcast slap release message: " + plugin.yc.configuration.getString("messages.releasebroadcast").replaceAll("__Default", plugin.ms.broadcastReleaseMessage)); + s.sendMessage("Personal slap no release message: " + plugin.yc.configuration.getString("messages.noreleasepersonal").replaceAll("__Default", plugin.ms.personalNoReleaseMessage)); + s.sendMessage("Sender slap no release message: " + plugin.yc.configuration.getString("messages.noreleasesender").replaceAll("__Default", plugin.ms.senderNoReleaseMessage)); + } + catch (NullPointerException e) { + plugin.ms.sendMessage(s, "configerror", "Messages section of the config.yml file "); + } } else { plugin.ms.sendMessage(s, "nopermission", null); @@ -210,5 +215,4 @@ else if (args[0].equalsIgnoreCase("general")) { return false; } } - }