From 11378f967fc75ebcdd9947fd5575f0cd9367f766 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sat, 23 Nov 2013 00:39:32 -0800 Subject: [PATCH] Fixed npc page ultra beta stuff. --- .../mineplex/hub/server/ui/ServerNpcPage.java | 12 +++++++++--- Website/LOCWebsite.suo | Bin 474624 -> 474624 bytes 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java index d0517a119..46f0428f6 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java @@ -98,7 +98,7 @@ public class ServerNpcPage extends ShopPageBase im if (serverInfo.CurrentPlayers >= serverInfo.MaxPlayers) { - if (!serverInfo.Game.equalsIgnoreCase("Survival Games")) + if (serverInfo.Game.equalsIgnoreCase("Survival Games")) { lore.add(ChatColor.RESET + C.Line + "Full Survival Games servers"); lore.add(ChatColor.RESET + C.Line + "cannot be joined."); @@ -113,9 +113,9 @@ public class ServerNpcPage extends ShopPageBase im } else { - if (serverInfo.Game.contains("Beta")) + if (getName().contains("Beta")) { - if (ownsUltraPackage) + if (DonationManager.Get(Player.getName()).OwnsUltraPackage()) lore.add(ChatColor.RESET + C.Line + "Click to join!"); else lore.add(ChatColor.RESET + C.Line + "Only Ultras can play games in Beta!"); @@ -200,6 +200,12 @@ public class ServerNpcPage extends ShopPageBase im public void SelectServer(Player player, ServerInfo serverInfo) { + if (getName().contains("Beta") && !(DonationManager.Get(Player.getName()).OwnsUltraPackage() || Client.GetRank().Has(Rank.ULTRA))) + { + PlayDenySound(player); + return; + } + int slots = Plugin.GetRequiredSlots(player, serverInfo.ServerType); if (serverInfo.MaxPlayers - serverInfo.CurrentPlayers < slots && !(DonationManager.Get(Player.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA") || Client.GetRank().Has(Rank.ULTRA))) diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index 1803948db41b907f1fb8833deba04debd8241fc3..1ff26b730428458b842ef1fab74e9283ad7d5fb3 100644 GIT binary patch delta 1604 zcmYk6e@s(X6vumB?|Ch?1%!gkH3GFLD6oQ3oIjh2x~QQ9iP6jnI)5&U6D=x?nJWI+ z9}6=+*Rw5}Au)}a{-Jd960?vxQ8S0ysdFqbPMz~d#u8>aGZ*7_o~5|kd~)9ReD6E= z^xbz~@R=j{%yD9&fE+DfQbpnxztGN# zGA)qi*JC7}78B+)_Op|7w7A``&34Yvf?2auz{2U&q!o#0`E4nnFEApR(*k3!q`+>L zBAJQ=Tz*JYFSuSI9K-qen=yyk$a3V%)Hc5{(NJrRd8}eE1YTOLL4@^M)6UB&P|nWg zVJFbmeG;}%Nd?R+X=SILX<$|`E19>MRm^H;4YQV6$Gk&_D`1l2IrqPn zv5Ysvl_@E(iM2KPM=0I}{uHpWeswq(h(HZh9fC6XR|KwE^qcp_dw@}7yvMjy(5!jt z3M&0k)IvY)ScRLlpgUX3tMu%R_8MihS9ncy>xOVh#|?4M6z&tssaqn=ZmHoV3Ye-s zx-&(6i#C2M#>+#G#a5s@k3^B2F(A%D_=&KP`!1NJ*@E+d0wtJ3!Np)9Z@}oGgIA0$ zx^04Ta!$i+YR|`XTKIw5O)($ZwbFhwwcdwxX|drG5xy+Up)smUy3BYJsPmw*jt0jm zR(+am&A?qCXFh-qMRw$2gOP&ARiC!KH%^`+yckN=@3UivVs7G=+mcU5##z_)Ip~zmnK%xF zo45GI0i(by{3yH<725ZknkrK_;A7Alidtm)SE>&vdQ7PborXM_Hy3Z)!Y!zT7o$}x z?{(2&si}~bf2rDKLo0TGw(@t6^sK`93Um;ZDVbDbgZ7aZ7Ifz~TC0BzWm4#qIhTAR zw8P^wX>KP@mBF%na?VhO@FA@{9!kaDiGO6tWH0Rikqn+APF4jk7Z5a51hx*~TQ; z4VM|iAKMP;4;N+3=#80+!Cm2)n2_?&O+&VdsPmEe$f8VfY0OQ0WEq~zD7(og_k4fn z`#a}%&OPVGZ@A(&TqBQBa)jSQOIYN4_0hk7)jH@bSc^<16G)H*l?ooSH&a(eX}Uc` zZDdhCIhh!b<%ED_OUb`@w^Gw{Qq*b~3RetzLC8kzQf94$Vyi=Zir%m3t3z3Qs-%I( zOQ-OGKB(5Z%9@CcbVz4=#;xgV=4z?=wtOn(vX)4hdpmR>WVVqmBc`lW-V>&sGIFb| zo;Z+QyzB5qV>&I~clHBv5UXm*!&OIQ#xs(LWD8$?^>=`=-uQ}z0G87q$9IR)X$L+m{u)&Fs6|(EtNwVD-^m$=IoSa%t!TcB2k1s zZr)Du4VEBqrQ^o}I$tPsvB<`O#c1%CFP!Z0c)ZO%$^-QD%i7$k;!08^P#BxEs5N zpb;ld!6w{+P@w)t8IJr$+Av+NIJoz+RrJ{56_VIXWNHBnD@#YO&zQzIy+SVphXspX zq(z!<=nP3*BUi+5Hbl&78Bh!+SdjNl>*&vi&+)X2-hs!q6Z?tIBC%l|d_vS>U>G>5 z3}P=Thk5EV2RcqFPFz387BJP#?i7L7nb)jEzF8pXdrP?~nycZgd8`q(5V}Twn57~x zwh8)iG8=}(kRMtgv6Fg)=OMU~rEUa8eH%sM<=0cuAs~VHT z24<5Yxeo#aJzued!ucT!5=_3QG~w_l+ak6#!~2B02g@++wN&7aGps;FT40!{y)rpf zu@0lfP>D&Og$nP-w3XoaUI_B=c^A4TSQyju#EH>dm=#UkaE_|4%1VddVZ~y8l>M?w zO+YQbkXO%r)WMUZ4ovldkEiks3RVIbce5uG3fU^&o`I{oj>nv^*0OX#@@-YJ;k_kl z5;cs9bT#{O%x1b*?yfhp!$QBtQi|0lb$KR+`T~=`9peIdR*pmLPc|2#v5dx8gQfp} DMv18Y