Merge pull request #1790 from mekolat/channel2

Allow to use channelmes without attached player
HerculesWS · Jul 12, 2017 · 3952388 · 3952388
2 parents 67f43db + b21dd60
commit 3952388
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/map/script.c b/src/map/script.c
@@ -23106,7 +23106,7 @@ BUILDIN(shopcount)
  */
 BUILDIN(channelmes)
 {
-	struct map_session_data *sd = script->rid2sd(st);
+	struct map_session_data *sd = map->id2sd(st->rid);
 	const char *channelname = script_getstr(st, 2);
 	struct channel_data *chan = channel->search(channelname, sd);
 
@@ -23124,9 +23124,10 @@ BUILDIN(channelmes)
 BUILDIN(addchannelhandler)
 {
 	int i;
+	struct map_session_data *sd = map->id2sd(st->rid);
 	const char *channelname = script_getstr(st, 2);
 	const char *eventname = script_getstr(st, 3);
-	struct channel_data *chan = channel->search(channelname, NULL);
+	struct channel_data *chan = channel->search(channelname, sd);
 
 	if (!chan) {
 		script_pushint(st, 0);
@@ -23149,9 +23150,10 @@ BUILDIN(addchannelhandler)
 BUILDIN(removechannelhandler)
 {
 	int i;
+	struct map_session_data *sd = map->id2sd(st->rid);
 	const char *channelname = script_getstr(st, 2);
 	const char *eventname = script_getstr(st, 3);
-	struct channel_data *chan = channel->search(channelname, NULL);
+	struct channel_data *chan = channel->search(channelname, sd);
 
 	if (!chan) {
 		script_pushint(st, 0);