Browse Source

Fix Antifeed and npe when the player tries to login

Luks 9 years ago
parent
commit
2aa7400f02

+ 6 - 1
L2J_Server/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java

@@ -157,7 +157,12 @@ public final class AntiFeedManager
 		
 		
 		final AtomicInteger connectionCount = event.computeIfAbsent(addrHash, k -> new AtomicInteger());
 		final AtomicInteger connectionCount = event.computeIfAbsent(addrHash, k -> new AtomicInteger());
 		
 		
-		return connectionCount.getAndIncrement() < (max + Config.L2JMOD_DUALBOX_CHECK_WHITELIST.getOrDefault(addrHash, 0));
+		if ((connectionCount.get() + 1) <= (max + Config.L2JMOD_DUALBOX_CHECK_WHITELIST.getOrDefault(addrHash, 0)))
+		{
+			connectionCount.incrementAndGet();
+			return true;
+		}
+		return false;
 	}
 	}
 	
 	
 	/**
 	/**

+ 5 - 0
L2J_Server/java/com/l2jserver/gameserver/network/serverpackets/AbstractHtmlPacket.java

@@ -132,6 +132,11 @@ public abstract class AbstractHtmlPacket extends L2GameServerPacket
 	public final void runImpl()
 	public final void runImpl()
 	{
 	{
 		L2PcInstance player = getClient().getActiveChar();
 		L2PcInstance player = getClient().getActiveChar();
+		if (player == null)
+		{
+			return;
+		}
+		
 		player.clearHtmlActions(getScope());
 		player.clearHtmlActions(getScope());
 		
 		
 		if (_disabledValidation)
 		if (_disabledValidation)