From e027e0313b720af999af7cba80326c768af2757d Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 21 Apr 2018 13:12:40 +0000 Subject: [PATCH] Revert null entry removals from game time controller. --- .../java/com/l2jmobius/gameserver/GameTimeController.java | 2 -- .../java/com/l2jmobius/gameserver/GameTimeController.java | 2 -- .../java/com/l2jmobius/gameserver/GameTimeController.java | 2 -- .../java/com/l2jmobius/gameserver/GameTimeController.java | 2 -- .../java/com/l2jmobius/gameserver/GameTimeController.java | 2 -- .../java/com/l2jmobius/gameserver/model/L2Party.java | 1 - .../java/com/l2jmobius/gameserver/GameTimeController.java | 2 -- .../java/com/l2jmobius/gameserver/GameTimeController.java | 2 -- 8 files changed, 15 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameTimeController.java index f5804aac4a..36afb0b3ac 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameTimeController.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameTimeController.java @@ -17,7 +17,6 @@ package com.l2jmobius.gameserver; import java.util.Calendar; -import java.util.Collections; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -129,7 +128,6 @@ public final class GameTimeController extends Thread */ private void moveObjects() { - _movingObjects.removeAll(Collections.singleton(null)); _movingObjects.removeIf(L2Character::updatePosition); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameTimeController.java index f5804aac4a..36afb0b3ac 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameTimeController.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameTimeController.java @@ -17,7 +17,6 @@ package com.l2jmobius.gameserver; import java.util.Calendar; -import java.util.Collections; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -129,7 +128,6 @@ public final class GameTimeController extends Thread */ private void moveObjects() { - _movingObjects.removeAll(Collections.singleton(null)); _movingObjects.removeIf(L2Character::updatePosition); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameTimeController.java index f5804aac4a..36afb0b3ac 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameTimeController.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameTimeController.java @@ -17,7 +17,6 @@ package com.l2jmobius.gameserver; import java.util.Calendar; -import java.util.Collections; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -129,7 +128,6 @@ public final class GameTimeController extends Thread */ private void moveObjects() { - _movingObjects.removeAll(Collections.singleton(null)); _movingObjects.removeIf(L2Character::updatePosition); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameTimeController.java index f5804aac4a..36afb0b3ac 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameTimeController.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameTimeController.java @@ -17,7 +17,6 @@ package com.l2jmobius.gameserver; import java.util.Calendar; -import java.util.Collections; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -129,7 +128,6 @@ public final class GameTimeController extends Thread */ private void moveObjects() { - _movingObjects.removeAll(Collections.singleton(null)); _movingObjects.removeIf(L2Character::updatePosition); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameTimeController.java index 15c06f11cf..8327f4e3a9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameTimeController.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameTimeController.java @@ -17,7 +17,6 @@ package com.l2jmobius.gameserver; import java.util.Calendar; -import java.util.Collections; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -129,7 +128,6 @@ public final class GameTimeController extends Thread */ private void moveObjects() { - _movingObjects.removeAll(Collections.singleton(null)); _movingObjects.removeIf(L2Character::updatePosition); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java index 6b553fe855..92ef7f19ba 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java @@ -329,7 +329,6 @@ public class L2Party extends AbstractPlayerGroup broadcastPacket(new ExPartyPetWindowAdd(player.getSummon())); } - // adjust party level if (player.getLevel() > _partyLvl) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameTimeController.java index f5804aac4a..36afb0b3ac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameTimeController.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameTimeController.java @@ -17,7 +17,6 @@ package com.l2jmobius.gameserver; import java.util.Calendar; -import java.util.Collections; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -129,7 +128,6 @@ public final class GameTimeController extends Thread */ private void moveObjects() { - _movingObjects.removeAll(Collections.singleton(null)); _movingObjects.removeIf(L2Character::updatePosition); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/GameTimeController.java index f5804aac4a..36afb0b3ac 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/GameTimeController.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/GameTimeController.java @@ -17,7 +17,6 @@ package com.l2jmobius.gameserver; import java.util.Calendar; -import java.util.Collections; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -129,7 +128,6 @@ public final class GameTimeController extends Thread */ private void moveObjects() { - _movingObjects.removeAll(Collections.singleton(null)); _movingObjects.removeIf(L2Character::updatePosition); }