Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-02-02 20:51:20 +01:00
Code Issues Projects Releases Wiki Activity

Closes gh-62. Fixed DrawZoneOutline setting not getting read from war and warzone config files. Updated to Craftbukkit 361 and empty ctor signature.

Browse Source
This commit is contained in:
taoneill 2011-02-20 03:02:47 -05:00
parent f197a7d60d
commit e1c33a2fef
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
war/src/main/java/bukkit/tommytony/war/War.java
View File

@ -1,6 +1,5 @@
package bukkit.tommytony.war;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -11,7 +10,6 @@ import java.util.logging.Logger;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
@ -24,7 +22,6 @@ import org.bukkit.event.Event.Priority;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.PluginLoader;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
@ -50,10 +47,8 @@ import com.tommytony.war.mappers.WarzoneMapper;
public class War extends JavaPlugin {
public static Permissions Permissions = null;
public War(PluginLoader pluginLoader, Server instance,
PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) {
super(pluginLoader, instance, desc, folder, plugin, cLoader);
this.desc = desc;
public War(){
super();
}
private WarPlayerListener playerListener = new WarPlayerListener(this);
@ -114,9 +109,7 @@ public class War extends JavaPlugin {
pm.registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.PLAYER_MOVE, playerListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_DAMAGEDBY_ENTITY, entityListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_DAMAGEDBY_PROJECTILE, entityListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_EXPLODE, entityListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_DEATH, entityListener, Priority.Normal, this);
pm.registerEvent(Event.Type.ENTITY_DAMAGED, entityListener, Priority.Normal, this);

13
war/src/main/java/bukkit/tommytony/war/WarEntityListener.java
View File

@ -51,10 +51,6 @@ public class WarEntityListener extends EntityListener {
}
}
}
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
handlerAttackDefend(event);
}
private void handlerAttackDefend(EntityDamageByEntityEvent event) {
Entity attacker = event.getDamager();
@ -144,10 +140,6 @@ public class WarEntityListener extends EntityListener {
}
}
public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
handlerAttackDefend(event);
}
public void onEntityExplode(EntityExplodeEvent event) {
// protect zones elements, lobbies and warhub from creepers
List<Block> explodedBlocks = event.blockList();
@ -172,7 +164,10 @@ public class WarEntityListener extends EntityListener {
}
public void onEntityDamage(EntityDamageEvent event) {
if(event.getCause() == DamageCause.FIRE_TICK) {
if(event instanceof EntityDamageByEntityEvent ||
event instanceof EntityDamageByProjectileEvent) {
handlerAttackDefend((EntityDamageByEntityEvent)event);
} else if(event.getCause() == DamageCause.FIRE_TICK) {
Entity entity = event.getEntity();
if(entity instanceof Player) {
Player player = (Player) entity;

2
war/src/main/java/com/tommytony/war/mappers/WarMapper.java
View File

@ -94,7 +94,7 @@ public class WarMapper {
war.setDefaultFriendlyFire(warConfig.getBoolean("defaultFriendlyFire"));
// defaultDrawZoneOutline
war.setDefaultFriendlyFire(warConfig.getBoolean("defaultDrawZoneOutline"));
war.setDefaultDrawZoneOutline(warConfig.getBoolean("defaultDrawZoneOutline"));
// defaultAutoAssignOnly
war.setDefaultAutoAssignOnly(warConfig.getBoolean("defaultAutoAssignOnly"));

2
war/src/main/java/com/tommytony/war/mappers/WarzoneMapper.java
View File

@ -167,7 +167,7 @@ public class WarzoneMapper {
warzone.setLifePool(warzoneConfig.getInt("lifePool"));
// drawZoneOutline
warzone.setFriendlyFire(warzoneConfig.getBoolean("drawZoneOutline"));
warzone.setDrawZoneOutline(warzoneConfig.getBoolean("drawZoneOutline"));
// autoAssignOnly
warzone.setAutoAssignOnly(warzoneConfig.getBoolean("autoAssignOnly"));