Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-27 12:46:11 +01:00
Code Issues Projects Releases Wiki Activity

Closes gh-93. Closes gh-104. Closes gh-105. Placing a team spawn over signs doens't cause sign spam anymore. Fixed player remaining on fire after score cap reached. Made wall trigger distance 6 blocks instead of 5 in last commit.

Browse Source
This commit is contained in:
taoneill 2011-03-20 21:54:06 -04:00
parent df68687092
commit 02cd9ad28d
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,6 +398,8 @@ public class Warzone {
// Fill hp
player.setHealth(20);
player.setFireTicks(0);
player.setRemainingAir(300);
// Teleport the player back to spawn
// Location playerLoc = player.getLocation();

11
war/src/main/java/com/tommytony/war/jobs/ScoreCapReachedJob.java
View File

@ -1,7 +1,6 @@
package com.tommytony.war.jobs;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;
import com.tommytony.war.Team;
import com.tommytony.war.Warzone;
@ -9,7 +8,6 @@ import com.tommytony.war.Warzone;
public class ScoreCapReachedJob implements Runnable {
private final Warzone zone;
private boolean giveReward;
private final String winnersStr;
public ScoreCapReachedJob(Warzone zone, String winnersStr) {
@ -22,6 +20,8 @@ public class ScoreCapReachedJob implements Runnable {
t.teamcast(winnersStr);
for(Player tp : t.getPlayers()) {
tp.teleportTo(zone.getTeleport()); // TODO: change this to a more general rally point (which will enable linking zones together)
tp.setFireTicks(0);
tp.setRemainingAir(300);
if(zone.hasPlayerInventory(tp.getName())){
zone.restorePlayerInventory(tp);
}
@ -36,11 +36,4 @@ public class ScoreCapReachedJob implements Runnable {
t.getPlayers().clear(); // empty the team
}
}
public void giveReward(boolean giveReward) {
this.giveReward = giveReward;
// TODO Auto-generated method stub
}
}

6
war/src/main/java/com/tommytony/war/volumes/Volume.java
View File

@ -400,15 +400,15 @@ public class Volume {
if(hasTwoCorners() && getBlockTypes() != null) {
int x = getMinX();
for(int i = 0; i < getSizeX(); i++){
int y = getMinY();
for(int j = 0; j < getSizeY(); j++){
int y = getMaxY();
for(int j = getSizeY(); j > 0; j--){
int z = getMinZ();
for(int k = 0;k < getSizeZ(); k++) {
Block currentBlock = getWorld().getBlockAt(x, y, z);
currentBlock.setType(material);
z++;
}
y++;
y--;
}
x++;
}