浏览代码

Updating team check

RedstoneFuture 1 年之前
父节点
当前提交
f7e6ffa170

+ 6 - 3
missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/game/GameListener.java

@@ -187,7 +187,9 @@ public class GameListener extends GameBoundListener {
         Player player = event.getPlayer();
         Player player = event.getPlayer();
         Team team = getGame().getPlayer(player).getTeam();
         Team team = getGame().getPlayer(player).getTeam();
 
 
-        if (team != null) {
+        if (team.getTeamType() == TeamType.PLAYER) {
+            TeamSpawnProtection.generateSpawn(team);
+            
             event.setRespawnLocation(team.getSpawn());
             event.setRespawnLocation(team.getSpawn());
             getGame().getEquipmentManager().sendGameItems(player, true);
             getGame().getEquipmentManager().sendGameItems(player, true);
             getGame().setPlayerAttributes(player);
             getGame().setPlayerAttributes(player);
@@ -207,10 +209,11 @@ public class GameListener extends GameBoundListener {
         if (!isInGameWorld(event.getEntity().getLocation())) return;
         if (!isInGameWorld(event.getEntity().getLocation())) return;
 
 
         Player player = event.getEntity();
         Player player = event.getEntity();
-        Team team = getGame().getPlayer(player).getTeam();
+        MWPlayer mwPlayer = getGame().getPlayer(player);
+        Team team = mwPlayer.getTeam();
 
 
         // check the death cause for choice the death message
         // check the death cause for choice the death message
-        if (team != null) {
+        if (team.getTeamType() == TeamType.PLAYER) {
 
 
             if (player.getLastDamageCause() == null) return;
             if (player.getLastDamageCause() == null) return;