Skip to content

Commit edc46d5

Browse files
author
magiclu550
committed
[JSMOD@2_468_COMMIT] fix some bugs
1 parent 1e44373 commit edc46d5

4 files changed

Lines changed: 42 additions & 3 deletions

File tree

JSMod2Core/src/main/java/cn/jsmod2/core/protocol/Requester.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ public Requester(Server sender, ControlPacket packet){
3737
}
3838

3939
public Requester with(String key,Object value){
40-
_map.put(key,value instanceof Vector?value.toString():value);
40+
_map.put(key,value.toString());
41+
return this;
42+
}
43+
44+
public Requester withObject(String key,Object value){
45+
_map.put(key,value);
4146
return this;
4247
}
4348

JSMod2DevelopKit/src/main/java/cn/jsmod2/core/interapi/network/IRequester.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ public interface IRequester {
55

66
IRequester with(String key, Object value);
77

8+
IRequester withObject(String key,Object value);
9+
810
IRequester end(String end);
911

1012
IRequester to();
Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
package cn.jsmod2.network.protocol.map.map;
22

3-
public class AnnounceCustomMessagePacket {
3+
import cn.jsmod2.core.protocol.SetPacket;
4+
5+
public class AnnounceCustomMessagePacket extends SetPacket {
6+
7+
public static final int ID = 144;
8+
9+
public String words;
10+
11+
public AnnounceCustomMessagePacket() {
12+
super(ID);
13+
}
14+
15+
@Override
16+
public void send() {
17+
requester.with("words",words).to();
18+
}
419
}
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
package cn.jsmod2.network.protocol.map.map;
22

3-
public class AnnounceNtfEntrancePacket {
3+
import cn.jsmod2.core.protocol.SetPacket;
4+
5+
public class AnnounceNtfEntrancePacket extends SetPacket {
6+
7+
public int scpsLeft;
8+
public int mtfNumber;
9+
public char mtfLetter;
10+
11+
public static final int ID = 145;
12+
13+
public AnnounceNtfEntrancePacket() {
14+
super(145);
15+
}
16+
17+
@Override
18+
public void send() {
19+
requester.with("scpsLeft",scpsLeft).with("mtfNumber",mtfNumber).with("mtfLetter",mtfLetter).to();
20+
}
421
}

0 commit comments

Comments
 (0)