From 654d461da519145921c4104f1e8b153eafd1b814 Mon Sep 17 00:00:00 2001 From: Ronan Lana Date: Tue, 18 May 2021 14:54:34 -0300 Subject: [PATCH 1/6] Revise non-related porridge loots Remove non-related item from mobs. --- sql/2-db_drops.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/sql/2-db_drops.sql b/sql/2-db_drops.sql index 98e29c3f9f..38cfc9351b 100644 --- a/sql/2-db_drops.sql +++ b/sql/2-db_drops.sql @@ -20299,8 +20299,6 @@ USE `cosmic`; (5130106, 2022001, 1, 1, 0, 20000), (6130102, 2022001, 1, 1, 0, 20000), (6130103, 2022001, 1, 1, 0, 20000), -(6130200, 2022001, 1, 1, 0, 20000), -(6130201, 2022001, 1, 1, 0, 20000), (2220000, 1322001, 1, 1, 0, 8000), (9400551, 4031447, 1, 1, 0, 999999); From 458de52dbcd6074a5a7126b1606c950857c4f8cf Mon Sep 17 00:00:00 2001 From: Ronan Lana Date: Tue, 18 May 2021 18:16:46 -0300 Subject: [PATCH 2/6] Broadcast damage from map hazard Fix taking damage from map hazard not showing to other players. --- src/main/java/tools/MaplePacketCreator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/tools/MaplePacketCreator.java b/src/main/java/tools/MaplePacketCreator.java index 453561979c..6009beeefa 100644 --- a/src/main/java/tools/MaplePacketCreator.java +++ b/src/main/java/tools/MaplePacketCreator.java @@ -2663,6 +2663,9 @@ public class MaplePacketCreator { mplew.writeShort(SendOpcode.DAMAGE_PLAYER.getValue()); mplew.writeInt(cid); mplew.write(skill); + if (skill == -3) { + mplew.writeInt(0); + } mplew.writeInt(damage); if(skill != -4) { mplew.writeInt(monsteridfrom); From f4a4acf7423dbef5ba72b7ed816427cfaaf7c1ee Mon Sep 17 00:00:00 2001 From: Ronan Lana Date: Tue, 18 May 2021 20:21:38 -0300 Subject: [PATCH 3/6] Encode status patch Filter out some status crashing players. --- src/main/java/tools/MaplePacketCreator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/tools/MaplePacketCreator.java b/src/main/java/tools/MaplePacketCreator.java index 6009beeefa..873714d839 100644 --- a/src/main/java/tools/MaplePacketCreator.java +++ b/src/main/java/tools/MaplePacketCreator.java @@ -1439,7 +1439,12 @@ public class MaplePacketCreator { private static void encodeTemporary(MaplePacketLittleEndianWriter mplew, Map stati) { int pCounter = -1, mCounter = -1; - + + Map stati = life.getStati().entrySet() // to patch some status crashing players + .stream() + .filter(e -> !(e.getKey().equals(MonsterStatus.WATK) || e.getKey().equals(MonsterStatus.WDEF))) + .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())); + writeLongEncodeTemporaryMask(mplew, stati.keySet()); // packet structure mapped thanks to Eric for (Entry s : stati.entrySet()) { From 2aa09f89dbf0b0396ad8450d96603661694681c4 Mon Sep 17 00:00:00 2001 From: Ronan Lana Date: Thu, 20 May 2021 13:01:42 -0300 Subject: [PATCH 4/6] fix: Minor code typo --- src/main/java/tools/MaplePacketCreator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tools/MaplePacketCreator.java b/src/main/java/tools/MaplePacketCreator.java index 873714d839..ee2afe54fd 100644 --- a/src/main/java/tools/MaplePacketCreator.java +++ b/src/main/java/tools/MaplePacketCreator.java @@ -1440,7 +1440,7 @@ public class MaplePacketCreator { private static void encodeTemporary(MaplePacketLittleEndianWriter mplew, Map stati) { int pCounter = -1, mCounter = -1; - Map stati = life.getStati().entrySet() // to patch some status crashing players + stati = stati.entrySet() // to patch some status crashing players .stream() .filter(e -> !(e.getKey().equals(MonsterStatus.WATK) || e.getKey().equals(MonsterStatus.WDEF))) .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())); From d330376706de7079b05434680c72d6652709dc02 Mon Sep 17 00:00:00 2001 From: Ronan Lana Date: Sat, 22 May 2021 11:56:37 -0300 Subject: [PATCH 5/6] fix: missed stream import --- src/main/java/tools/MaplePacketCreator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tools/MaplePacketCreator.java b/src/main/java/tools/MaplePacketCreator.java index ee2afe54fd..24ddae49ec 100644 --- a/src/main/java/tools/MaplePacketCreator.java +++ b/src/main/java/tools/MaplePacketCreator.java @@ -70,9 +70,9 @@ import java.awt.*; import java.net.InetAddress; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.List; import java.util.*; import java.util.Map.Entry; +import java.util.stream.Collectors; /** * From 3d5db5d79cf74110d60b3489bd85d0fa1eaa5e4c Mon Sep 17 00:00:00 2001 From: Ronan Lana Date: Sat, 22 May 2021 14:48:44 -0300 Subject: [PATCH 6/6] fix: incurred ambiguity import --- src/main/java/tools/MaplePacketCreator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/tools/MaplePacketCreator.java b/src/main/java/tools/MaplePacketCreator.java index 24ddae49ec..72f3fe3963 100644 --- a/src/main/java/tools/MaplePacketCreator.java +++ b/src/main/java/tools/MaplePacketCreator.java @@ -70,6 +70,7 @@ import java.awt.*; import java.net.InetAddress; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.List; import java.util.*; import java.util.Map.Entry; import java.util.stream.Collectors;