summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/party.c8
2 files changed, 2 insertions, 8 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 06f5fba3b..399ec8634 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,7 @@
Date Added
+2011/10/17
+ * Remove 'hack code' in party_member_added causing crashes since r14968. (bugreport:5069) [FlavioJS]
2011/10/16
* Added support for new act/damage packet 0x2e1 (ZC_NOTIFY_ACT2) for clients 2007-11-13Sakexe and newer. [Ai4rei]
* Added a message indicating how many concurrent connections the server was compiled to support. [Ai4rei]
diff --git a/src/map/party.c b/src/map/party.c
index 0ef07864d..9649505b4 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -488,14 +488,6 @@ int party_member_added(int party_id,int account_id,int char_id, int flag)
sd->status.party_id = party_id;
- ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == 0 );
- if (i < MAX_PARTY) {
- //TODO: This is a hack to allow the following clif calls to send the data to the new player.
- //The correct player data is set when party_recv_info arrives soon afterwards.
- party_fill_member(&p->party.member[i], sd, 0);
- p->data[i].sd = sd;
- }
-
clif_party_member_info(p,sd);
clif_party_option(p,sd,0x100);
clif_party_info(p,sd);