lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted last commit.

Browse Source
This commit is contained in:
MobiusDev
2018-06-12 13:33:55 +00:00
parent 5610e74ef7
commit 675fc4c029
8 changed files with 16 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.network; package com.l2jmobius.gameserver.network;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
@@ -34,8 +33,6 @@ public final class Disconnection
{ {
private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName()); private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName());
private ScheduledFuture<?> _disconnectionTask;
public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar) public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar)
{ {
if (client != null) if (client != null)
@@ -170,24 +167,12 @@ public final class Disconnection
public void defaultSequence(boolean toLoginScreen) public void defaultSequence(boolean toLoginScreen)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(toLoginScreen); close(toLoginScreen);
} }
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(packet); close(packet);
} }
@@ -200,9 +185,9 @@ public final class Disconnection
public void onDisconnection() public void onDisconnection()
{ {
if ((_activeChar != null) && (_disconnectionTask == null)) if (_activeChar != null)
{ {
_disconnectionTask = ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME); ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME);
} }
} }
} }

19
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.network; package com.l2jmobius.gameserver.network;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
@@ -34,8 +33,6 @@ public final class Disconnection
{ {
private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName()); private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName());
private ScheduledFuture<?> _disconnectionTask;
public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar) public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar)
{ {
if (client != null) if (client != null)
@@ -170,24 +167,12 @@ public final class Disconnection
public void defaultSequence(boolean toLoginScreen) public void defaultSequence(boolean toLoginScreen)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(toLoginScreen); close(toLoginScreen);
} }
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(packet); close(packet);
} }
@@ -200,9 +185,9 @@ public final class Disconnection
public void onDisconnection() public void onDisconnection()
{ {
if ((_activeChar != null) && (_disconnectionTask == null)) if (_activeChar != null)
{ {
_disconnectionTask = ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME); ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME);
} }
} }
} }

19
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.network; package com.l2jmobius.gameserver.network;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
@@ -34,8 +33,6 @@ public final class Disconnection
{ {
private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName()); private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName());
private ScheduledFuture<?> _disconnectionTask;
public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar) public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar)
{ {
if (client != null) if (client != null)
@@ -170,24 +167,12 @@ public final class Disconnection
public void defaultSequence(boolean toLoginScreen) public void defaultSequence(boolean toLoginScreen)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(toLoginScreen); close(toLoginScreen);
} }
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(packet); close(packet);
} }
@@ -200,9 +185,9 @@ public final class Disconnection
public void onDisconnection() public void onDisconnection()
{ {
if ((_activeChar != null) && (_disconnectionTask == null)) if (_activeChar != null)
{ {
_disconnectionTask = ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME); ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME);
} }
} }
} }

19
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.network; package com.l2jmobius.gameserver.network;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
@@ -34,8 +33,6 @@ public final class Disconnection
{ {
private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName()); private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName());
private ScheduledFuture<?> _disconnectionTask;
public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar) public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar)
{ {
if (client != null) if (client != null)
@@ -170,24 +167,12 @@ public final class Disconnection
public void defaultSequence(boolean toLoginScreen) public void defaultSequence(boolean toLoginScreen)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(toLoginScreen); close(toLoginScreen);
} }
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(packet); close(packet);
} }
@@ -200,9 +185,9 @@ public final class Disconnection
public void onDisconnection() public void onDisconnection()
{ {
if ((_activeChar != null) && (_disconnectionTask == null)) if (_activeChar != null)
{ {
_disconnectionTask = ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME); ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME);
} }
} }
} }

19
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.network; package com.l2jmobius.gameserver.network;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
@@ -34,8 +33,6 @@ public final class Disconnection
{ {
private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName()); private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName());
private ScheduledFuture<?> _disconnectionTask;
public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar) public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar)
{ {
if (client != null) if (client != null)
@@ -170,24 +167,12 @@ public final class Disconnection
public void defaultSequence(boolean toLoginScreen) public void defaultSequence(boolean toLoginScreen)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(toLoginScreen); close(toLoginScreen);
} }
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(packet); close(packet);
} }
@@ -200,9 +185,9 @@ public final class Disconnection
public void onDisconnection() public void onDisconnection()
{ {
if ((_activeChar != null) && (_disconnectionTask == null)) if (_activeChar != null)
{ {
_disconnectionTask = ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME); ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME);
} }
} }
} }

19
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.network; package com.l2jmobius.gameserver.network;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
@@ -34,8 +33,6 @@ public final class Disconnection
{ {
private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName()); private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName());
private ScheduledFuture<?> _disconnectionTask;
public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar) public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar)
{ {
if (client != null) if (client != null)
@@ -170,24 +167,12 @@ public final class Disconnection
public void defaultSequence(boolean toLoginScreen) public void defaultSequence(boolean toLoginScreen)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(toLoginScreen); close(toLoginScreen);
} }
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(packet); close(packet);
} }
@@ -200,9 +185,9 @@ public final class Disconnection
public void onDisconnection() public void onDisconnection()
{ {
if ((_activeChar != null) && (_disconnectionTask == null)) if (_activeChar != null)
{ {
_disconnectionTask = ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME); ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME);
} }
} }
} }

19
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.network; package com.l2jmobius.gameserver.network;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
@@ -34,8 +33,6 @@ public final class Disconnection
{ {
private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName()); private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName());
private ScheduledFuture<?> _disconnectionTask;
public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar) public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar)
{ {
if (client != null) if (client != null)
@@ -170,24 +167,12 @@ public final class Disconnection
public void defaultSequence(boolean toLoginScreen) public void defaultSequence(boolean toLoginScreen)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(toLoginScreen); close(toLoginScreen);
} }
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(packet); close(packet);
} }
@@ -200,9 +185,9 @@ public final class Disconnection
public void onDisconnection() public void onDisconnection()
{ {
if ((_activeChar != null) && (_disconnectionTask == null)) if (_activeChar != null)
{ {
_disconnectionTask = ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME); ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME);
} }
} }
} }

19
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.network; package com.l2jmobius.gameserver.network;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
@@ -34,8 +33,6 @@ public final class Disconnection
{ {
private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName()); private static final Logger LOGGER = Logger.getLogger(Disconnection.class.getName());
private ScheduledFuture<?> _disconnectionTask;
public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar) public static L2GameClient getClient(L2GameClient client, L2PcInstance activeChar)
{ {
if (client != null) if (client != null)
@@ -170,24 +167,12 @@ public final class Disconnection
public void defaultSequence(boolean toLoginScreen) public void defaultSequence(boolean toLoginScreen)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(toLoginScreen); close(toLoginScreen);
} }
public void defaultSequence(IClientOutgoingPacket packet) public void defaultSequence(IClientOutgoingPacket packet)
{ {
if (_disconnectionTask != null)
{
_disconnectionTask.cancel(false);
_disconnectionTask = null;
}
defaultSequence(); defaultSequence();
close(packet); close(packet);
} }
@@ -200,9 +185,9 @@ public final class Disconnection
public void onDisconnection() public void onDisconnection()
{ {
if ((_activeChar != null) && (_disconnectionTask == null)) if (_activeChar != null)
{ {
_disconnectionTask = ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME); ThreadPool.schedule(() -> defaultSequence(), _activeChar.canLogout() ? 0 : AttackStanceTaskManager.COMBAT_TIME);
} }
} }
} }