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 18194052c..242dfc94b 100644 Binary files a/Website/LOCWebsite.suo and b/Website/LOCWebsite.suo differ