mirror of
https://github.com/taoneill/war.git
synced 2024-11-27 12:46:11 +01:00
Closes gh-225. Finally compatible with RB935 with PLAYER_MOVE changes that prevent teleport loops that broke the plugin from CB888 on. Now only using event.setTo(). Adjusted some messages.
This commit is contained in:
taoneill
parent
5bad6a26cc
commit
6929b81dc4
@ -157,7 +157,7 @@ public class War extends JavaPlugin {
|
||||
pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Priority.Normal, this);
|
||||
pm.registerEvent(Event.Type.ENTITY_COMBUST, entityListener, Priority.Normal, this);
|
||||
pm.registerEvent(Event.Type.CREATURE_SPAWN, entityListener, Priority.Normal, this);
|
||||
//pm.registerEvent(Event.Type.ENTITY_REGAIN_HEALTH, entityListener, Priority.Normal, this);
|
||||
pm.registerEvent(Event.Type.ENTITY_REGAIN_HEALTH, entityListener, Priority.Normal, this);
|
||||
|
||||
pm.registerEvent(Event.Type.BLOCK_PLACE, blockListener, Priority.Normal, this);
|
||||
pm.registerEvent(Event.Type.BLOCK_BREAK, blockListener, Priority.Normal, this);
|
||||
@ -632,7 +632,7 @@ public class War extends JavaPlugin {
|
||||
for(Player p : team.getPlayers()) {
|
||||
warzone.restorePlayerInventory(p);
|
||||
p.teleport(warzone.getTeleport());
|
||||
this.msg(player, "You have left the warzone. Your inventory has (hopefully) been restored.");
|
||||
this.msg(player, "You have left the warzone. Your inventory has been restored.");
|
||||
}
|
||||
team.resetPoints();
|
||||
team.getPlayers().clear();
|
||||
|
||||
@ -15,6 +15,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
|
||||
import org.bukkit.event.entity.EntityDeathEvent;
|
||||
import org.bukkit.event.entity.EntityExplodeEvent;
|
||||
import org.bukkit.event.entity.EntityListener;
|
||||
import org.bukkit.event.entity.EntityRegainHealthEvent;
|
||||
//import org.bukkit.event.entity.EntityRegainHealthEvent;
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
@ -211,19 +212,19 @@ public class WarEntityListener extends EntityListener {
|
||||
}
|
||||
}
|
||||
|
||||
// public void onEntityRegainHealth(EntityRegainHealthEvent event) {
|
||||
// if(war.isLoaded()) {
|
||||
// Entity entity = event.getEntity();
|
||||
// if(entity instanceof Player) {
|
||||
// Player player = (Player) entity;
|
||||
// Location location = player.getLocation();
|
||||
// Warzone zone = war.warzone(location);
|
||||
// if(zone != null) {
|
||||
// if (((CraftPlayer) player).getHandle().ticksLived % 20 * 12 == 0) {
|
||||
// event.setCancelled(true);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
public void onEntityRegainHealth(EntityRegainHealthEvent event) {
|
||||
if(war.isLoaded()) {
|
||||
Entity entity = event.getEntity();
|
||||
if(entity instanceof Player) {
|
||||
Player player = (Player) entity;
|
||||
Location location = player.getLocation();
|
||||
Warzone zone = war.warzone(location);
|
||||
if(zone != null) {
|
||||
if (((CraftPlayer) player).getHandle().ticksLived % 20 * 12 == 0) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -212,7 +212,6 @@ public class WarPlayerListener extends PlayerListener {
|
||||
setter.placeCorner2(event.getClickedBlock());
|
||||
event.setUseItemInHand(Result.ALLOW);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -250,7 +249,6 @@ public class WarPlayerListener extends PlayerListener {
|
||||
}
|
||||
}
|
||||
|
||||
boolean enteredGate = false;
|
||||
// Warzone lobby gates
|
||||
if(locLobby != null) {
|
||||
Warzone zone = locLobby.getZone();
|
||||
@ -262,7 +260,6 @@ public class WarPlayerListener extends PlayerListener {
|
||||
if(zone.isDisabled()){
|
||||
handleDisabledZone(event, player, zone);
|
||||
} else {
|
||||
enteredGate = true;
|
||||
dropFromOldTeamIfAny(player);
|
||||
int noOfPlayers = 0;
|
||||
for(Team t : zone.getTeams()) {
|
||||
@ -270,15 +267,13 @@ public class WarPlayerListener extends PlayerListener {
|
||||
}
|
||||
if(noOfPlayers < zone.getTeams().size() * zone.getTeamCap()) {
|
||||
Team team = zone.autoAssign(player);
|
||||
event.setFrom(team.getTeamSpawn());
|
||||
event.setCancelled(true);
|
||||
|
||||
if(war.getWarHub() != null) {
|
||||
war.getWarHub().resetZoneSign(zone);
|
||||
}
|
||||
} else {
|
||||
event.setFrom(zone.getTeleport());
|
||||
player.teleport(zone.getTeleport());
|
||||
event.setCancelled(true);
|
||||
event.setTo(zone.getTeleport());
|
||||
//player.teleport(zone.getTeleport());
|
||||
war.badMsg(player, "All teams are full.");
|
||||
}
|
||||
}
|
||||
@ -288,7 +283,6 @@ public class WarPlayerListener extends PlayerListener {
|
||||
// go through all the team gates
|
||||
for(Team team : zone.getTeams()){
|
||||
if(zone.getLobby().isInTeamGate(team, playerLoc)) {
|
||||
enteredGate = true;
|
||||
dropFromOldTeamIfAny(player);
|
||||
if(zone.isDisabled()){
|
||||
handleDisabledZone(event, player, zone);
|
||||
@ -305,21 +299,18 @@ public class WarPlayerListener extends PlayerListener {
|
||||
t.teamcast("" + player.getName() + " joined team " + team.getName() + ".");
|
||||
}
|
||||
} else {
|
||||
event.setFrom(zone.getTeleport());
|
||||
player.teleport(zone.getTeleport());
|
||||
event.setCancelled(true);
|
||||
event.setTo(zone.getTeleport());
|
||||
war.badMsg(player, "Team " + team.getName() + " is full.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (war.getWarHub() != null && zone.getLobby().isInWarHubLinkGate(playerLoc)){
|
||||
enteredGate = true;
|
||||
if (war.getWarHub() != null && zone.getLobby().isInWarHubLinkGate(playerLoc)
|
||||
&& !war.getWarHub().getVolume().contains(player.getLocation())){
|
||||
dropFromOldTeamIfAny(player);
|
||||
event.setFrom(war.getWarHub().getLocation());
|
||||
player.teleport(war.getWarHub().getLocation());
|
||||
event.setCancelled(true);
|
||||
event.setTo(war.getWarHub().getLocation());
|
||||
//player.teleport(war.getWarHub().getLocation());
|
||||
war.msg(player, "Welcome to the War hub.");
|
||||
return;
|
||||
}
|
||||
@ -329,46 +320,44 @@ public class WarPlayerListener extends PlayerListener {
|
||||
|
||||
// Warhub zone gates
|
||||
WarHub hub = war.getWarHub();
|
||||
if(hub != null && hub.getVolume().contains(playerLoc)) {
|
||||
if(hub != null && hub.getVolume().contains(player.getLocation())) {
|
||||
Warzone zone = hub.getDestinationWarzoneForLocation(playerLoc);
|
||||
if(zone != null && zone.getTeleport() != null) {
|
||||
enteredGate = true;
|
||||
event.setFrom(zone.getTeleport());
|
||||
player.teleport(zone.getTeleport());
|
||||
event.setCancelled(true);
|
||||
event.setTo(zone.getTeleport());
|
||||
//player.teleport(zone.getTeleport());
|
||||
war.msg(player, "Welcome to warzone " + zone.getName() + ".");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if(locZone != null && locZone.getLobby() != null
|
||||
&& locZone.getLobby().isLeavingZone(playerLoc)) { // already in a team and in warzone, leaving
|
||||
enteredGate = true;
|
||||
// same as leave
|
||||
boolean isLeaving = playerWarzone != null && playerWarzone.getLobby().isLeavingZone(playerLoc);
|
||||
Team playerTeam = war.getPlayerTeam(player.getName());
|
||||
if(isLeaving) { // already in a team and in warzone, leaving
|
||||
// same as leave
|
||||
if(playerTeam != null) {
|
||||
event.setFrom(playerWarzone.getTeleport());
|
||||
playerWarzone.handlePlayerLeave(player, playerWarzone.getTeleport(), true);
|
||||
event.setCancelled(true);
|
||||
boolean atSpawnAlready = playerTeam.getTeamSpawn().getBlockX() == player.getLocation().getBlockX() &&
|
||||
playerTeam.getTeamSpawn().getBlockY() == player.getLocation().getBlockY() &&
|
||||
playerTeam.getTeamSpawn().getBlockZ() == player.getLocation().getBlockZ();
|
||||
if(!atSpawnAlready) {
|
||||
playerWarzone.handlePlayerLeave(player, playerWarzone.getTeleport(), event, true);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(playerWarzone != null && !enteredGate) {
|
||||
Team team = war.getPlayerTeam(player.getName());
|
||||
|
||||
if(playerWarzone != null) {
|
||||
// Player belongs to a warzone team but is outside: he snuck out or is at spawn and died
|
||||
if(locZone == null && team != null) {;
|
||||
war.badMsg(player, "You can't sneak out of a zone while in a team. Use /leave or walk out the lobby to exit the zone, please.");
|
||||
event.setFrom(team.getTeamSpawn());
|
||||
player.teleport(team.getTeamSpawn());
|
||||
event.setCancelled(true);
|
||||
if(locZone == null && playerTeam != null && playerWarzone.getLobby() != null
|
||||
&& !playerWarzone.getLobby().getVolume().contains(playerLoc)
|
||||
&& !isLeaving) {
|
||||
war.badMsg(player, "Use /leave to exit the zone.");
|
||||
event.setTo(playerTeam.getTeamSpawn());
|
||||
return;
|
||||
}
|
||||
|
||||
// Monuments //SY
|
||||
if(team != null
|
||||
&& playerWarzone.nearAnyOwnedMonument(playerLoc, team)
|
||||
if(playerTeam != null
|
||||
&& playerWarzone.nearAnyOwnedMonument(playerLoc, playerTeam)
|
||||
&& player.getHealth() < 20
|
||||
&& player.getHealth() > 0 // don't heal the dead
|
||||
&& random.nextInt(77) == 3 ) { // one chance out of many of getting healed
|
||||
@ -391,22 +380,21 @@ public class WarPlayerListener extends PlayerListener {
|
||||
|
||||
// Flag capture
|
||||
if(playerWarzone.isFlagThief(player.getName())
|
||||
&& (team.getSpawnVolume().contains(player.getLocation())
|
||||
|| (team.getFlagVolume() != null && team.getFlagVolume().contains(player.getLocation())))) {
|
||||
if(playerWarzone.isTeamFlagStolen(team)) {
|
||||
&& (playerTeam.getSpawnVolume().contains(player.getLocation())
|
||||
|| (playerTeam.getFlagVolume() != null && playerTeam.getFlagVolume().contains(player.getLocation())))) {
|
||||
if(playerWarzone.isTeamFlagStolen(playerTeam)) {
|
||||
war.badMsg(player, "You can't capture the enemy flag until your team's flag is returned.");
|
||||
} else {
|
||||
synchronized(playerWarzone) {
|
||||
// flags can be captured at own spawn or own flag pole
|
||||
team.addPoint();
|
||||
if(team.getPoints() >= playerWarzone.getScoreCap()) {
|
||||
playerTeam.addPoint();
|
||||
if(playerTeam.getPoints() >= playerWarzone.getScoreCap()) {
|
||||
if(playerWarzone.hasPlayerInventory(player.getName())){
|
||||
playerWarzone.restorePlayerInventory(player);
|
||||
}
|
||||
playerWarzone.handleScoreCapReached(player, team.getName());
|
||||
event.setFrom(playerWarzone.getTeleport());
|
||||
player.teleport(playerWarzone.getTeleport());
|
||||
event.setCancelled(true);
|
||||
playerWarzone.handleScoreCapReached(player, playerTeam.getName());
|
||||
event.setTo(playerWarzone.getTeleport());
|
||||
//player.teleport(playerWarzone.getTeleport());
|
||||
} else {
|
||||
// added a point
|
||||
Team victim = playerWarzone.getVictimTeamForThief(player.getName());
|
||||
@ -414,11 +402,11 @@ public class WarPlayerListener extends PlayerListener {
|
||||
victim.initializeTeamFlag();
|
||||
for(Team t : playerWarzone.getTeams()) {
|
||||
t.teamcast(player.getName() + " captured team " + victim.getName()
|
||||
+ "'s flag. Team " + team.getName() + " scores one point." );
|
||||
+ "'s flag. Team " + playerTeam.getName() + " scores one point." );
|
||||
}
|
||||
playerWarzone.respawnPlayer(event, team, player);
|
||||
team.resetSign();
|
||||
playerWarzone.getLobby().resetTeamGateSign(team);
|
||||
playerWarzone.respawnPlayer(event, playerTeam, player);
|
||||
playerTeam.resetSign();
|
||||
playerWarzone.getLobby().resetTeamGateSign(playerTeam);
|
||||
}
|
||||
playerWarzone.removeThief(player.getName());
|
||||
}
|
||||
@ -429,9 +417,8 @@ public class WarPlayerListener extends PlayerListener {
|
||||
&& !locZone.getLobby().isLeavingZone(playerLoc) && !isMaker) {
|
||||
// player is not in any team, but inside warzone boundaries, get him out
|
||||
Warzone zone = war.warzone(playerLoc);
|
||||
event.setFrom(zone.getTeleport());
|
||||
player.teleport(zone.getTeleport());
|
||||
event.setCancelled(true);
|
||||
event.setTo(zone.getTeleport());
|
||||
//player.teleport(zone.getTeleport());
|
||||
war.badMsg(player, "You can't be inside a warzone without a team.");
|
||||
return;
|
||||
}
|
||||
@ -441,9 +428,7 @@ public class WarPlayerListener extends PlayerListener {
|
||||
private void handleDisabledZone(PlayerMoveEvent event, Player player, Warzone zone) {
|
||||
if(zone.getLobby() != null) {
|
||||
war.badMsg(player, "This warzone is disabled.");
|
||||
event.setFrom(zone.getTeleport());
|
||||
player.teleport(zone.getTeleport());
|
||||
event.setCancelled(true);
|
||||
event.setTo(zone.getTeleport());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -206,14 +206,15 @@ public class Warzone {
|
||||
|
||||
public void respawnPlayer(Team team, Player player) {
|
||||
handleRespawn(team, player);
|
||||
|
||||
// Teleport the player back to spawn
|
||||
player.teleport(team.getTeamSpawn());
|
||||
}
|
||||
|
||||
public void respawnPlayer(PlayerMoveEvent event, Team team, Player player) {
|
||||
event.setFrom(team.getTeamSpawn());
|
||||
handleRespawn(team, player);
|
||||
|
||||
event.setCancelled(true);
|
||||
// Teleport the player back to spawn
|
||||
event.setTo(team.getTeamSpawn());
|
||||
//player.teleport(team.getTeamSpawn());
|
||||
}
|
||||
|
||||
private void handleRespawn(Team team, Player player){
|
||||
@ -222,9 +223,6 @@ public class Warzone {
|
||||
player.setRemainingAir(300);
|
||||
player.setHealth(20);
|
||||
|
||||
// Teleport the player back to spawn
|
||||
player.teleport(team.getTeamSpawn());
|
||||
|
||||
LoadoutResetJob job = new LoadoutResetJob(this, team, player);
|
||||
war.getServer().getScheduler().scheduleSyncDelayedTask(war, job);
|
||||
}
|
||||
@ -825,7 +823,17 @@ public class Warzone {
|
||||
}
|
||||
}
|
||||
|
||||
public void handlePlayerLeave(Player player, Location destination, PlayerMoveEvent event, boolean removeFromTeam) {
|
||||
handlePlayerLeave(player, removeFromTeam);
|
||||
event.setTo(destination);
|
||||
}
|
||||
|
||||
public void handlePlayerLeave(Player player, Location destination, boolean removeFromTeam) {
|
||||
handlePlayerLeave(player, removeFromTeam);
|
||||
player.teleport(destination);
|
||||
}
|
||||
|
||||
private void handlePlayerLeave(Player player, boolean removeFromTeam) {
|
||||
Team playerTeam = war.getPlayerTeam(player.getName());
|
||||
if(playerTeam !=null) {
|
||||
if(removeFromTeam) playerTeam.removePlayer(player.getName());
|
||||
@ -851,8 +859,8 @@ public class Warzone {
|
||||
player.setHealth(20);
|
||||
player.setFireTicks(0);
|
||||
player.setRemainingAir(300);
|
||||
player.teleport(destination);
|
||||
war.msg(player, "Left the zone. Your inventory has (hopefully) been restored.");
|
||||
|
||||
war.msg(player, "Left the zone. Your inventory has been restored.");
|
||||
if(war.getWarHub() != null) {
|
||||
war.getWarHub().resetZoneSign(this);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user