From d4900c38b1dd8b0104fe6dbe5bebe96e0bca442c Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Thu, 23 Oct 2014 23:58:13 -0700
Subject: [PATCH] Halloween server max. CustomTagFix fix for invis armor stand
 on your own head.

---
 .../src/mineplex/core/CustomTagFix.java       |   8 +++++++-
 .../mineplex/servermonitor/ServerMonitor.java |   7 +++++++
 Website/LOCWebsite.suo                        | Bin 474624 -> 474624 bytes
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
index 25afae99d..0fe952a89 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
@@ -227,7 +227,13 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler
 				}
 				else
 				*/
-				if (attachPacket.c == owner.getEntityId())
+				//System.out.println(owner.getName() + " id=" + owner.getEntityId() + " recieving AttachPacket b=" + attachPacket.b + " c=" + attachPacket.c);
+				if (attachPacket.c == -1 && _entityMap.get(owner).containsKey(attachPacket.b))
+				{
+					verifier.bypassProcess(new PacketPlayOutEntityDestroy(_entityMap.get(owner).get(attachPacket.b)));
+					_entityMap.get(owner).remove(attachPacket.b);
+				}				
+				else if (attachPacket.c == owner.getEntityId())
 				{
 					if (_entityMap.get(owner).containsKey(attachPacket.b))
 					{
diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
index 35486340a..6e46c726c 100644
--- a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
+++ b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
@@ -270,6 +270,13 @@ public class ServerMonitor
 			else if (serversToKill > 0)
 				serversToKill = Math.min(serversToKill, (availableSlots - 1500) / 80);
 		}
+		else if (serverGroup.getName().equalsIgnoreCase("Halloween"))
+		{
+			if (serverGroup.getServers().size() > 250)
+			{
+				serversToAdd = 0;
+			}
+		}
 		
 		while (serversToAdd > 0)
 		{
diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo
index 18194052ce37ee7dcdb164b96430f9bb6a2ba820..242dfc94b7f30d951ffa8e2a9153c23cf47b2382 100644
GIT binary patch
delta 1153
zcmYL|ZA@H66o&7)cg}dh3d@HTarqDsu(Yz0QcT6N-C)3KR)VzxYDEH}?GFQGwR}W#
zZAqoXM&MG8A(U*P*$~s{!YV_PstZ;ljcKvL+8=~a(zIYGkY-y6X~0>2;3Ut?nR(CT
z%*>lH9$Ae?R&S>UwdNTu6FxP6)snGEQIvG^o@Q*R`}^(Tg=?V61;y9EUgzdzX7dF?
zS*SW^^Q}hj3(*s#6eS^WsOdgeJOXIG#)L)&M|}^HujS||QjFeA2)w&Lo#E!x)f`~3
z)pz*Ru{YS-`ue)>_FvX8b7-l|SGMATzT07a0hKx$VHdg2u&t*3N8Pvo{skaQmBwkY
z15$n4A5Oy1>h_o61KN=dZ!(vvD8k5w@8QXS3@0Uvl4Z$tNfN!511I!gtp{={CUc-U
zk4g&Ebo%TV?4}DNY8bT$_EOg&ND(RZFm=_eh_!Ycv;?JSIAjjKpC^n0^|*x`er6L{
zC91QW95G=3!at%4|A^*ag8>??!93v?%&t@4C`6OH47Q0q|FAL8LzP*ZqUeg48DqOR
z$^I8e6HDVPB9Xjz*?DT1XW`@<z}=n&7Dkp<rvISh3Q*QKFBj#j%#AcOr`6L>t(Z#X
zjcTkIF|ZJ**x=n%gUE$j#pb6&f|uNAVuuy$fCl2Qq}|Ym<FV%*h!JN$#(pqAoX#Zg
zMX;zh`)ITctIf8InBjVKsgEC!HeHoY1<hJ-z~{vIMtl!F&8T)YqI{d<I0a_KLac~A
ziFbgC43(3!RSgxER$K;}U50#---4IG^CdF!Hfv7d?8G5}mSCYO(|g2XIvvrXwGBVf
zXsnRsirla9GC+4wFEy9#4$;$vl|b#6u#zU)r6DanSP!0VRLN1T7K`EqoB)y3i_;<E
z-T+2H*YEgN@I|}H=m?(i8=Q)xKW||sSys7~5^o`caABW9FOZQ4Nh0YAPDgBJSVZOw
zjzU*PP?^SQpl8Q1QCQ}128L(Rg_!V|qV!Wk2R=`Ickv)C&*PkFW1;lb9Ue(+9v^uE
z$UKY4J^7psuV8cNh7TKF&}o%Fg~4!bur?XQ9~yV5<mWt@+$SNI+!rBH{LJ~;jFgQe
znHVeUJtMJ8;w15sp!SL!$;jd^c1lKKC5!73U4?v4#9^gUsZx$AFDOTpI%(a%^xaK(
zmF!Dw3pt<AcFMn8M4#VKPmo>bsd8^WD2ms7@nJRD3^h`W4f0-~-cqj9Oea{W^okZn
z69wG%zfv*0j~nOAqJ?b{P4}~ZJ8=42|3^EUYQwb~Ey?D&v?!`c(=2A<dOVfy1?E}c
aD)kMik#v2DM~l=&-VJ2u-0oTC&i?>P^swFl

delta 1292
zcmYk6ZA?^06o%)_&KY-CB?}@Vtn9k3DV0@m8#QTbMPp)1ji@!PRYX8Ano5hZ4IifV
zYN_=jHM&<gN}!=gw)W$PvJK;pwqmM{7+Wl*jcJt7)&d$!s9hRDbnUF5^(0U7X6C#z
zch1bY#yzKT&w2Wo1$LP=mbtLgyl9z$>5Q>=%)czggg+WijQrFA7Cm5uE5*yw>ebSv
zAy~@O!x6i%^K1U_NMg3lih6j`<EcOz0*G*xt4hF*@X(Boh1Lf;5+5f-HmprIU)<me
z2dX0i`or4}l&=u4>P5mge|E+-^~ME#K61<jJ2lpbBs1%4Yk2LyUqDlYQ(-YA&`1zc
z!oJ}yFkAj!A6|bm1T7=J=O93{=R=N&>b;aPAHIaiL!7ZL&46Z5)2Ydzmlnc%)`*r5
zGrJZ-^<t<n&ulCiSHucffECd6s7y7pQj$Xz&_Rd2;5R4aC5$g&Z?Pg)%(k;K$|;9=
z%2>|#I;eRcIH=wWUbSEy&(1dsQ=Gv(2l<xs#1Goea@BU$(iWw*a>!C`N@Q7KtKMr9
zx!3W8xZ;Z3l5KAmZ{At3C6HSlOi!k}X<|!wcP|H<opt&dv$0=jbvquX1sB9(I3LqT
z>FOmhkLF$!HhR4s52%gbir)l0ktfpG((ftrqS#0sL()Z#f25VZxq%LKqFq$ELT!Rm
zX(7a!rBAuloZF&vBKg~8zRDjFjTjo%vug}lN2Q2THFB(;YCAZNu|t}un(f3gz*{kW
zbjOC)G^~FOT&m%1JPEbsDD1JT9u2c6!%xN)o)CPa$aMJatrZyH<CC=W2mKUcui-%@
z&Q#4+n2XKGYdbA&<=%@uK!t~R3YC5iR^>6U8>sXXa41JL4nj@D;-u&xq^o87@hb@J
zLr$lQKpPKYk0o>jMd&bcsG}tvSWcx@i&xdxViAOnArIB*<TX>|ezpHNRsb16^eXR1
zc-=;;yM&8Yc8MHX^rx^=UcXpG-`x_=Qp062nI@mY=vek=czqg8`V?PzvfT7;uS`nv
z=oj@Uo*C22{=cwfGTh)%p3B%BPe=R2)Q7J4iH|I7@LY=4scO|FJPowsf^gJk#0=fB
z3OqKb#n<sXP-CC4#}<&SzheOLfG+Austn@O)YON0^nR~&DqjzF0S(?l2RZuj8m;cf
zOd7hNPo<3>%DjQL(NhFz&kNu+Gh61UHT8HElxG0D(Y)KYmg;8mRjT<m=2}{ZvD$9)
z=pVuiO_V<5a*A!!SQkal>~Mj)Vvzw3yD95F->uF`*^uE))*rS=lcGu0WND^p(loL5
zi$R8821eU<*e|W|p$LlFJLo3&GMP4Y4%^Ji*jC+_CA#w%`xRmp+ZHIM>GyF8<rhf5
zYJ6ViLu<A)K891YXAAD4{3RelcO<91$uLXJ8j!U>O)Wfu5(Z=<{WxAG%7X31I|F5*
HLAmljW)aKy