mirror of
https://github.com/taoneill/war.git
synced 2025-01-23 15:51:22 +01:00
Shot a vid for 0.3. Assorted bugs.
This commit is contained in:
parent
55046e7895
commit
003b89f904
@ -920,7 +920,7 @@ public class War extends JavaPlugin {
|
||||
}
|
||||
if(namedParams.containsKey("pvpinzonesonly")){
|
||||
String onOff = namedParams.get("pvpinzonesonly");
|
||||
setDefaultDrawZoneOutline(onOff.equals("on") || onOff.equals("true"));
|
||||
setPvpInZonesOnly(onOff.equals("on") || onOff.equals("true"));
|
||||
}
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
|
@ -157,7 +157,7 @@ public class WarEntityListener extends EntityListener {
|
||||
} else if (attackerTeam == null && defenderTeam == null && !war.isPvpInZonesOnly()){
|
||||
// let normal PVP through is its not turned off
|
||||
} else if (attackerTeam == null && defenderTeam == null && war.isPvpInZonesOnly()) {
|
||||
a.sendMessage("Global pvp is turned off. You can only attack other players in warzones. Try /warhub, /zones and /zone.");
|
||||
a.sendMessage(war.str("Your attack missed! Global PVP is turned off. You can only attack other players in warzones. Try /warhub, /zones and /zone."));
|
||||
event.setCancelled(true); // global pvp is off
|
||||
} else {
|
||||
a.sendMessage(war.str("Your attack missed!"));
|
||||
|
@ -365,7 +365,7 @@ public class Warzone {
|
||||
} else if (team.getMaterial() == Material.IRON_BLOCK) {
|
||||
playerInv.setHelmet(new ItemStack(Material.IRON_HELMET));
|
||||
}
|
||||
//player.setHealth(20);
|
||||
player.setHealth(20);
|
||||
}
|
||||
|
||||
public boolean isMonumentCenterBlock(Block block) {
|
||||
|
@ -86,7 +86,7 @@ commands:
|
||||
#|-Defaults--
|
||||
setwarconfig:
|
||||
description: War makers only. Change the default warzone configuration values.
|
||||
usage: /setwarconfig lifepool:8 teamsize:5 maxscore:7 autoassign:on outline:off ff:on
|
||||
usage: /setwarconfig pvpinzonesonly:on lifepool:8 teamsize:5 maxscore:7 autoassign:on outline:off ff:on
|
||||
|
||||
|
||||
#-Fallback-
|
||||
|
@ -86,7 +86,7 @@ commands:
|
||||
#|-Defaults--
|
||||
setwarconfig:
|
||||
description: War makers only. Change the default warzone configuration values.
|
||||
usage: /setwarconfig lifepool:8 teamsize:5 maxscore:7 autoassign:on outline:off ff:on
|
||||
usage: /setwarconfig pvpinzonesonly:on lifepool:8 teamsize:5 maxscore:7 autoassign:on outline:off ff:on
|
||||
|
||||
|
||||
#-Fallback-
|
||||
|
Loading…
Reference in New Issue
Block a user