[JSMOD@2_470_COMMIT] Set/GetPacket -> *MapPacket

Author: magiclu550

JSMod2Protocol/src/main/java/cn/jsmod2/network/protocol/map/map/AnnounceCustomMessagePacket.java

@@ -1,8 +1,7 @@
 package cn.jsmod2.network.protocol.map.map;
 
-import cn.jsmod2.core.protocol.SetPacket;
 
-public class AnnounceCustomMessagePacket extends SetPacket {
+public class AnnounceCustomMessagePacket extends SetMapPacket {
 
     public static final int ID = 144;
 

JSMod2Protocol/src/main/java/cn/jsmod2/network/protocol/map/map/AnnounceNtfEntrancePacket.java

@@ -1,8 +1,8 @@
 package cn.jsmod2.network.protocol.map.map;
 
-import cn.jsmod2.core.protocol.SetPacket;
 
-public class AnnounceNtfEntrancePacket extends SetPacket {
+
+public class AnnounceNtfEntrancePacket extends SetMapPacket {
 
     public int scpsLeft;
     public int mtfNumber;

JSMod2Protocol/src/main/java/cn/jsmod2/network/protocol/map/map/AnnounceScpKillPacket.java

@@ -1,9 +1,8 @@
 package cn.jsmod2.network.protocol.map.map;
 
 import cn.jsmod2.api.player.Player;
-import cn.jsmod2.core.protocol.SetPacket;
 
-public class AnnounceScpKillPacket extends SetPacket {
+public class AnnounceScpKillPacket extends SetMapPacket {
 
     public static final int ID = 146;
 

JSMod2Protocol/src/main/java/cn/jsmod2/network/protocol/map/map/BroadCastPacket.java

@@ -1,8 +1,8 @@
 package cn.jsmod2.network.protocol.map.map;
 
-import cn.jsmod2.core.protocol.SetPacket;
 
-public class BroadCastPacket extends SetPacket {
+
+public class BroadCastPacket extends SetMapPacket {
 
     public int duration;
     public String message;

JSMod2Protocol/src/main/java/cn/jsmod2/network/protocol/map/map/ClearBroadcastsPacket.java

@@ -1,8 +1,7 @@
 package cn.jsmod2.network.protocol.map.map;
 
-import cn.jsmod2.core.protocol.SetPacket;
 
-public class ClearBroadcastsPacket extends SetPacket {
+public class ClearBroadcastsPacket extends SetMapPacket {
 
     public static final int ID = 148;
 

JSMod2Protocol/src/main/java/cn/jsmod2/network/protocol/map/map/DetonateWarheadMapPacket.java

@@ -1,8 +1,7 @@
 package cn.jsmod2.network.protocol.map.map;
 
-import cn.jsmod2.core.protocol.SetPacket;
 
-public class DetonateWarheadMapPacket extends SetPacket {
+public class DetonateWarheadMapPacket extends SetMapPacket {
 
     public static final int ID = 149;
 

JSMod2Protocol/src/main/java/cn/jsmod2/network/protocol/map/map/FemurBreakerMapPacket.java

@@ -1,8 +1,8 @@
 package cn.jsmod2.network.protocol.map.map;
 
-import cn.jsmod2.core.protocol.SetPacket;
 
-public class FemurBreakerMapPacket extends SetPacket {
+
+public class FemurBreakerMapPacket extends SetMapPacket {
 
 
     public static final int ID = 150;

JSMod2Protocol/src/main/java/cn/jsmod2/network/protocol/map/map/Get079InteractionRoomsPacket.java

@@ -2,9 +2,9 @@
 
 import cn.jsmod2.api.map.Room;
 import cn.jsmod2.api.map.Scp079InteractionType;
-import cn.jsmod2.core.protocol.GetPacket;
 
-public class Get079InteractionRoomsPacket extends GetPacket {
+
+public class Get079InteractionRoomsPacket extends GetMapPacket {
 
     public static final int ID = 151;
 

JSMod2Protocol/src/main/java/cn/jsmod2/network/protocol/map/map/GetBlastDoorPointsPacket.java

@@ -2,9 +2,8 @@
 
 import cn.jsmod2.api.team.Role;
 import cn.jsmod2.core.math.Vector;
-import cn.jsmod2.core.protocol.GetPacket;
 
-public class GetBlastDoorPointsPacket extends GetPacket {
+public class GetBlastDoorPointsPacket extends GetMapPacket {
 
     public Role role;
 
@@ -16,6 +15,6 @@ public GetBlastDoorPointsPacket(){
 
     @Override
     public Object send() {
-        return requester.with("role",role);
+        return requester.with("role",role).to();
     }
 }