From 16d6cd367fb192c6d2934e178252b588f6ce17a6 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 11 Sep 2020 22:41:41 +0000 Subject: [PATCH] Fixed custom event player count conditions. Contributed by G-hamsteR. --- .../java/org/l2jmobius/gameserver/model/entity/event/CTF.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/entity/event/DM.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/entity/event/TvT.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/entity/event/CTF.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/entity/event/DM.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/entity/event/TvT.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/CTF.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/CTF.java index c5565dddb4..61b0915d54 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/CTF.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/CTF.java @@ -558,7 +558,7 @@ public class CTF implements EventTask */ public static boolean checkMinPlayers(int players) { - return _minPlayers > players; + return _minPlayers <= players; } /** @@ -568,7 +568,7 @@ public class CTF implements EventTask */ public static boolean checkMaxPlayers(int players) { - return _maxPlayers <= players; + return _maxPlayers > players; } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/DM.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/DM.java index cfaf13ad09..76bbc7f7f5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/DM.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/DM.java @@ -532,7 +532,7 @@ public class DM implements EventTask */ public static boolean checkMinPlayers(int players) { - return _minPlayers > players; + return _minPlayers <= players; } /** @@ -542,7 +542,7 @@ public class DM implements EventTask */ public static boolean checkMaxPlayers(int players) { - return _maxPlayers <= players; + return _maxPlayers > players; } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/TvT.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/TvT.java index f9b5a4536d..300f03dd41 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/TvT.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/TvT.java @@ -537,7 +537,7 @@ public class TvT implements EventTask */ public static boolean checkMinPlayers(int players) { - return _minPlayers > players; + return _minPlayers <= players; } /** @@ -547,7 +547,7 @@ public class TvT implements EventTask */ public static boolean checkMaxPlayers(int players) { - return _maxPlayers <= players; + return _maxPlayers > players; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java index 75e1211907..5a6f885bfc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java @@ -558,7 +558,7 @@ public class CTF implements EventTask */ public static boolean checkMinPlayers(int players) { - return _minPlayers > players; + return _minPlayers <= players; } /** @@ -568,7 +568,7 @@ public class CTF implements EventTask */ public static boolean checkMaxPlayers(int players) { - return _maxPlayers <= players; + return _maxPlayers > players; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java index c080e2e992..e9a3b6b0e6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java @@ -532,7 +532,7 @@ public class DM implements EventTask */ public static boolean checkMinPlayers(int players) { - return _minPlayers > players; + return _minPlayers <= players; } /** @@ -542,7 +542,7 @@ public class DM implements EventTask */ public static boolean checkMaxPlayers(int players) { - return _maxPlayers <= players; + return _maxPlayers > players; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java index 963d659dcf..57817bb95c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java @@ -537,7 +537,7 @@ public class TvT implements EventTask */ public static boolean checkMinPlayers(int players) { - return _minPlayers > players; + return _minPlayers <= players; } /** @@ -547,7 +547,7 @@ public class TvT implements EventTask */ public static boolean checkMaxPlayers(int players) { - return _maxPlayers <= players; + return _maxPlayers > players; } /**