From a4d127afcf96e148ad5dabdb4cccfaa2da725d8c Mon Sep 17 00:00:00 2001 From: CanIGetaPR <45294513+CanIGetaPR@users.noreply.github.com> Date: Fri, 26 Apr 2019 07:40:39 -0400 Subject: [PATCH 1/4] Fixes #455 CME When moving player (#456) --- src/client/MapleCharacter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/MapleCharacter.java b/src/client/MapleCharacter.java index 5e0d36d712..5b0c50e317 100644 --- a/src/client/MapleCharacter.java +++ b/src/client/MapleCharacter.java @@ -166,6 +166,7 @@ import server.life.MobSkillFactory; import server.maps.MapleMapItem; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; +import org.apache.mina.util.ConcurrentHashSet; public class MapleCharacter extends AbstractMapleCharacterObject { private static final MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); @@ -249,7 +250,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private final Map quests; private Set controlled = new LinkedHashSet<>(); private Map entered = new LinkedHashMap<>(); - private Set visibleMapObjects = new LinkedHashSet<>(); + private Set visibleMapObjects = new ConcurrentHashSet<>(); private Map skills = new LinkedHashMap<>(); private Map activeCoupons = new LinkedHashMap<>(); private Map activeCouponRates = new LinkedHashMap<>(); From 6f00bada1045337a39d62c45d49d0ba99660672a Mon Sep 17 00:00:00 2001 From: CanIGetaPR <45294513+CanIGetaPR@users.noreply.github.com> Date: Fri, 26 Apr 2019 07:47:53 -0400 Subject: [PATCH 2/4] Make it more clear that production use is a goal (#454) Make it more clear that heavenms is open to becoming production-use ready but just isn't there right now. Encourage members to contribute. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bcb558c73f..33c3fb1758 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ Paypal: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3K8 * HeavenMS staff has __no current intention__ to publicly open a server with this source, if that ever comes to happen this note will be lifted. __Don't be scammed!__ -* This server source is __NOT intended to be stable__ as is. Proper deadlock review and other maintenance checks are needed in order to make it suitable for production use. +* This server source is __NOT intended to be stable__ as is. But with **your** help we can get there. Proper deadlock review and other maintenance contributions are needed in order to make it suitable for production use. Please help where you can to better the server for everyone. --- ### Preparing the ambient From 4df2a22422702536ab90b49ff3270631a2a9a723 Mon Sep 17 00:00:00 2001 From: Ronan Lana Date: Fri, 26 Apr 2019 08:50:48 -0300 Subject: [PATCH 3/4] Update README.md Adding clarifications & typo fixes on the readme. --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 33c3fb1758..ef6388092b 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Java7 SDK: https://www.oracle.com/technetwork/java/javase/downloads/java-archive --- ### Open-source client development - HeavenClient -Continuing from where **SYJourney**'s JourneyClient has finished contributions (as of 5 Jul 2016), an open-source delevopment of a software artifact designed to handle both gaming operations and interactions with the server is being conducted. +Continuing from where **SYJourney**'s JourneyClient has finished contributions (as of 5 Jul 2016), an open-source development of a software artifact designed to handle both gaming operations and interactions with the server is being conducted. Newer implementations are being maintained by **頼晏 (ryantpayton)** and aims to offer higher display resolution, bring recent UI contents for the pre-BB gameplay and incremental support on overall gaming perspective. @@ -84,16 +84,20 @@ By taking the v83 MapleStory as the angular stone, incrementally look forward to #### Announcements -HeavenMS development achieved an acceptable state-of-the-art and will get into a halt. A heartfelt thanks for everyone that contributed in some way for the progress of this server! +HeavenMS development as we can see right now achieved an acceptable state-of-the-art. A heartfelt thanks for everyone that contributed in some way for the progress of this server! -Although development is halted, support for fixing features that were implemented here is still up. You can still actively help us improve the server by issuing pull requests with informative details about what's changing. +As development and support for fixing features that were implemented here is still up, with **your** help we can improve it even further! Please help where you can to better the server for everyone. + +Furthermore, you can actively help improving the server by issuing pull requests with informative details about what's changing. + +Note for anyone up to contribute further pull requests: make awareness to use __english language__ in codes and messages, as usage of any other languages will render it open to faculty of whether this content will be ready to be accepted or *further changes are going to be requested* before it becomes apt to merge. + +#### Support HeavenMS If you liked this project, please don't forget to __star__ the repo ;) . It's never enough to tell this, thanks to everyone that have been contributing something for the continuous improvement of the server! Be it through bug reports, donation, code snippets and/or pull requests. -Note for anyone up to contribute further pull requests: make awareness to use __english language__ in codes and messages, as usage of any other languages will render it open to faculty of whether this content will be ready to be accepted or *further changes are going to be requested* before it becomes apt to merge. - Our Discord channel is still available on: https://discord.gg/Q7wKxHX @@ -110,7 +114,7 @@ Paypal: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3K8 * HeavenMS staff has __no current intention__ to publicly open a server with this source, if that ever comes to happen this note will be lifted. __Don't be scammed!__ -* This server source is __NOT intended to be stable__ as is. But with **your** help we can get there. Proper deadlock review and other maintenance contributions are needed in order to make it suitable for production use. Please help where you can to better the server for everyone. +* This server source is __NOT intended to be stable__ as is. Proper deadlock review and other maintenance contributions are needed in order to make it steps ahead on viability. --- ### Preparing the ambient From 1213fff1eddba2ed0d3b3f288998d5ab3ceab339 Mon Sep 17 00:00:00 2001 From: CanIGetaPR <45294513+CanIGetaPR@users.noreply.github.com> Date: Wed, 1 May 2019 12:24:27 -0400 Subject: [PATCH 4/4] Fix NPE when custom code changes a player's HP (#458) --- src/client/MapleCharacter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/MapleCharacter.java b/src/client/MapleCharacter.java index 5b0c50e317..300321eb3e 100644 --- a/src/client/MapleCharacter.java +++ b/src/client/MapleCharacter.java @@ -8605,8 +8605,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } }; - - map.registerCharacterStatUpdate(r); + if (map != null) { + map.registerCharacterStatUpdate(r); + } } private Pair calcHpRatioUpdate(int newHp, int oldHp) {