Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-01-07 16:27:44 +01:00
Code Issues Projects Releases Wiki Activity

Closes gh-226. Respawn now stops fire properly.

Browse Source
This commit is contained in:
taoneill 2011-09-09 23:54:32 -04:00
parent 25e034965d
commit f20b275ba9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
war/src/main/java/com/tommytony/war/Warzone.java
View File

@ -290,12 +290,10 @@ public class Warzone {
this.handleRespawn(team, player);
// Teleport the player back to spawn
event.setTo(team.getTeamSpawn());
// player.teleport(team.getTeamSpawn());
}
private void handleRespawn(Team team, Player player) {
// Fill hp
player.setFireTicks(0);
player.setRemainingAir(300);
player.setHealth(20);
@ -817,10 +815,6 @@ public class Warzone {
}
}
playerTeam.resetSign();
Plugin heroicDeath = War.war.getServer().getPluginManager().getPlugin("HeroicDeath");
if (heroicDeath != null) {
}
}
}

2
war/src/main/java/com/tommytony/war/jobs/LoadoutResetJob.java
View File

@ -19,6 +19,8 @@ public class LoadoutResetJob implements Runnable {
public void run() {
this.zone.resetInventory(this.team, this.player);
// Stop fire here, since doing it in the same tick as death doesn't extinguish it
player.setFireTicks(0);
}
}