[JSMOD@2_472_COMMIT] set IPlayer

Author: magiclu550

JSMod2API/src/main/java/cn/jsmod2/api/event/team/TeamRespawnEvent.java

@@ -9,30 +9,34 @@
 package cn.jsmod2.api.event.team;
 
 import cn.jsmod2.api.player.IPlayer;
+import cn.jsmod2.api.player.Player;
 import cn.jsmod2.core.event.Event;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class TeamRespawnEvent extends Event implements ITeamRespawnEvent{
 
-    private List<IPlayer> playerList;
+    private List<Player> playerList = new ArrayList<>();
 
     private boolean spawnChaos;
 
-    public TeamRespawnEvent(List<IPlayer> playerList,boolean isCI){
+    public TeamRespawnEvent(List<Player> playerList, boolean isCI){
         this.playerList = playerList;
         this.spawnChaos = isCI;
     }
     public TeamRespawnEvent(){
 
     }
 
-    public List<IPlayer> getPlayerList() {
+    public List<Player> getPlayerList() {
         return playerList;
     }
 
     public void setPlayerList(List<IPlayer> playerList) {
-        this.playerList = playerList;
+        for(IPlayer p : playerList){
+            this.playerList.add((Player)p);
+        }
     }
 
     public boolean isSpawnChaos() {

JSMod2API/src/main/java/cn/jsmod2/api/map/Map.java

@@ -9,7 +9,8 @@
 package cn.jsmod2.api.map;
 
 
-import cn.jsmod2.api.item.IItem;
+
+import cn.jsmod2.api.item.Item;
 import cn.jsmod2.api.item.ItemType;
 import cn.jsmod2.api.player.IPlayer;
 import cn.jsmod2.api.player.Player;
@@ -30,7 +31,7 @@ public class Map implements IMap, Serializable {
     private boolean warheadDetonated;
     private boolean LCZDecontaminated;
 
-    public List<IItem> getItems(ItemType type, boolean world_only){
+    public List<Item> getItems(ItemType type, boolean world_only){
         return null;
     }
 
@@ -53,7 +54,7 @@ public List<IDoor> getDoors() {
     }
 
 
-    public List<IPocketDimensionExit> getPocketDimensionExits() {
+    public List<PocketDimensionExit> getPocketDimensionExits() {
         return null;
     }
 
@@ -103,7 +104,7 @@ public void femurBreaker(boolean enable) {
     }
 
 
-    public List<IElevator> getElevators() {
+    public List<Elevator> getElevators() {
         return null;
     }
 
@@ -117,7 +118,7 @@ public String getIntercomContent(IntercomStatus intercomStatus) {
     }
 
 
-    public List<ITeslaGate> getTeslaGates() {
+    public List<TeslaGate> getTeslaGates() {
         return null;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/player/Player.java

@@ -8,17 +8,15 @@
  */
 package cn.jsmod2.api.player;
 
-import cn.jsmod2.api.item.IItem;
+
 import cn.jsmod2.api.item.Item;
 import cn.jsmod2.api.item.ItemType;
 import cn.jsmod2.api.team.ITeamRole;
 import cn.jsmod2.api.team.Role;
 import cn.jsmod2.api.team.TeamRole;
 import cn.jsmod2.api.user.UserGroup;
 import cn.jsmod2.core.CommandSender;
-import cn.jsmod2.core.ISimplePlayer;
 import cn.jsmod2.core.Server;
-import cn.jsmod2.core.annotations.UseForServerInit;
 import cn.jsmod2.core.math.Vector;
 
 import java.io.Serializable;
@@ -173,7 +171,7 @@ public Item giveItem(ItemType type){
         return null;
     }
 
-    public List<IItem> getInventory(){
+    public List<Item> getInventory(){
         return null;
     }
 

JSMod2API/src/test/java/cn/jsmod2/Test.java

@@ -1,8 +1,21 @@
 package cn.jsmod2;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Test {
 
     public static void main(String[] args) {
+    }
 
+    public static List<A> getAs(){
+        return new ArrayList<>();
     }
 }
+class A implements IA{
+
+}
+
+interface IA{
+
+}

JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/team/ITeamRespawnEvent.java

@@ -18,7 +18,7 @@
 public interface ITeamRespawnEvent extends IEvent {
 
 
-    List<IPlayer> getPlayerList();
+    List<? extends IPlayer> getPlayerList();
 
     void setPlayerList(List<IPlayer> playerList);
 

JSMod2DevelopKit/src/main/java/cn/jsmod2/api/map/IMap.java

@@ -11,7 +11,7 @@
 
 public interface IMap {
 
-    public List<IItem> getItems(ItemType type, boolean world_only);
+    public List<? extends IItem> getItems(ItemType type, boolean world_only);
 
     Vector getRandomSpawnPoint(Role role);
 
@@ -20,10 +20,10 @@ public interface IMap {
     List<Vector> getBlastDoorPoints();
 
 
-    List<IDoor> getDoors();
+    List<? extends IDoor> getDoors();
 
 
-    List<IPocketDimensionExit> getPocketDimensionExits();
+    List<? extends IPocketDimensionExit> getPocketDimensionExits();
 
 
     java.util.Map<Vector, Vector> getElevatorTeleportPoints();
@@ -53,15 +53,15 @@ public interface IMap {
     void femurBreaker(boolean enable);
 
 
-    List<IElevator> getElevators();
+    List<? extends IElevator> getElevators();
 
 
     void setIntercomContent(IntercomStatus intercomStatus, String content);
 
     String getIntercomContent(IntercomStatus intercomStatus);
 
 
-    List<ITeslaGate> getTeslaGates();
+    List<? extends ITeslaGate> getTeslaGates();
 
 
     void announceNtfEntrance(int scpsLeft, int mtfNumber, char mtfLetter);

JSMod2DevelopKit/src/main/java/cn/jsmod2/api/player/IPlayer.java

@@ -68,7 +68,7 @@ public interface IPlayer extends ISimplePlayer {
 
     IItem giveItem(ItemType type);
 
-    List<IItem> getInventory();
+    List<? extends IItem> getInventory();
 
     IItem getCurrentItem();