Permalink
Browse files

v0.8.0.0 - player death handling rewrite

  • Loading branch information...
1 parent 9c873dc commit 5371b1e2a260d929a218f5997d4996b51bbcf5ed @slipcor committed May 25, 2012
View
@@ -46,98 +46,13 @@ A PVP experience enhancing plugin.
=== Changelog
-* v0.7.25.0 - rewrite of /pa {arenaname} info
-* v0.7.24.0 - attempt to improve the statistics usage
-* v0.7.23.4 - fixed the woolhead removal - again
-* v0.7.23.3 - fix an issue with death events
-* v0.7.23.2 - fix late joining
-* v0.7.23.1 - fix freefight type issues, fix classitems messing causing NPEs
-* v0.7.23.0 - /pa [name] alive - list alive players
-* v0.7.22.2 - fix PotionEffects not being removed properly
-* v0.7.22.1 - more intelligent and extroverted help system
-* v0.7.22.0 - add readying of all teams with checkEachTeam: false
-* v0.7.21.0 - fix many issues inside modules
-* v0.7.20.13 - fix an NPE on non pvp death
-* v0.7.20.12 - add cylindric arena region shape
-* v0.7.20.11 - fix custom class not working
-* v0.7.20.10 - fix the end timer not deactivating PVP for losers
-* v0.7.20.8 - fix issues....
-* v0.7.20.7 - fix stuff and update for tank arena mode
-* v0.7.20.6 - fix alot of permissions issues oO
-* v0.7.20.5 - fix the wool head not being correctly secured
-* v0.7.20.4 - fix the ready up bug
-* v0.7.20.3 - fix various bugs
-* v0.7.20.2 - fix various bugs
-* v0.7.20.1 - fix teams/ctf/pumpkin lounge setting not working
-* v0.7.20.0 - feature freeze, future updates will just add/update modules or fix bugs
-* v0.7.19.5 - fix messy code about random spawns
-* v0.7.19.4 - fix teams/ctf/pumpkin spawn setting not working
-* v0.7.19.3 - fix region NPE
-* v0.7.19.2 - fix missing messages
-* v0.7.19.1 - fix multiple enchantments
-* v0.7.19.0 - command handling rewrite
-* v0.7.18.0 - region modules
-* v0.7.17.4 - fix chest restoring
-* v0.7.17.3 - make the countdown timer configurable
-* v0.7.17.2 - fix arenaboards displaying the global stats for players during a match
-* v0.7.17.1 - fix fluids and block burning not being cancellable/replaced properly
-* v0.7.17.0 - (more) correctly calculate armor in order to detect death
-* v0.7.16.1 - fix when teleporting players
-* v0.7.16.0 - more colors!
-* v0.7.15.0 - /pa readylist - to see people not being flagged as ready
-* v0.7.14.1 - add a delay to teleporting, making the player teleporting thread safe
-* v0.7.14.0 - teleport to spawns with /pa tp [spawnname]
-* v0.7.13.1 - FIRST restore blocks, then restore inventories!
-* v0.7.13.0 - add config setting to force warming up on /pa join | /pa spectate
-* v0.7.12.1 - fix /pa [name] remove [spawnname]
-* v0.7.12.0 - multiple Enchantments
-* v0.7.11.3 - add a different tracker
-* v0.7.11.2 - fix the player handling / inventory issue
-* v0.7.10.6 - fix the Loader
-* v0.7.10.5 - fix watching players not belonging to the arena
-* v0.7.10.4 - fix restoring of the team nameplate
-* v0.7.10.3 - fix timed (team) arenas giving no rewards
-* v0.7.10.2 - fix timed arenas totally f up
-* v0.7.10.1 - fix CraftBukkitUpToDate compatibility
-* v0.7.10.0 - add restoring of dispensers and furnaces
-* v0.7.9.22 - change game.allowDrops priority. Custom class not needed!
-* v0.7.9.21 - fix module loading
-* v0.7.9.20 - fix modules not containing version
-* v0.7.9.19 - fix player recognition -.-
-* v0.7.9.18 - fix spheric regions not being saved properly
-* v0.7.9.17 - fix all arena type ready methods
-* v0.7.9.16 - fix CTF/Pumpkin interact cancelling
-* v0.7.9.15 - hook inv shift click to protection.inventory
-* v0.7.9.14 - fix ColorTeams
-* v0.7.9.13 - fix CTF/Pumpkin arena returning "Flag set:" on many occasions ^^
-* v0.7.9.12 - fix mobs messing up the game. bad, bad mobs!
-* v0.7.9.11 - fix an NPE with activated quit check
-* v0.7.9.10 - fix ArenaBoards not working if spectators are present
-* v0.7.9.9 - fix many issues with invisible armor, players etc by disabling the team coloring function
-* v0.7.9.8 - fix team chat doubling
-* v0.7.9.7 - add customisable end timer, add damage cancelling
-* v0.7.9.6 - fix an NPE with /pa bet [player]
-* v0.7.9.5 - fix an NPE possible on arena end
-* v0.7.9.4 - fix more beta bugs
-* v0.7.9.2 - fix various bugs
-* v0.7.9 - rewrite concerning ArenaPlayer / Players
-* v0.7.8 - ArenaModule: Announcements
-* v0.7.7 - ArenaModule: TempPerms
-* v0.7.6 - ArenaModule: PowerUps
-* v0.7.5 - ArenaModule: VaultSupport
-* v0.7.4 - ArenaModule: Economy
-* v0.7.3 - ArenaModule: BlockRestore
-* v0.7.2 - ArenaModule: ColorTeams
-* v0.7.1 - ArenaModule: ArenaBoards
-* v0.7.0.3 - Kick leads to arena leave
-* v0.7.0.2 - Chest restoring
-* v0.7 - another huge rewrite, modules that provide Arena Types
+* v0.8.0.0 - major rewrite of player death handling, fixes many things
-----------------------------------------------------------------------------------------------------------------------
=== Todo
-* PAExitEvent (called on leave, win, lose, end, death etc)
+*
-----------------------------------------------------------------------------------------------------------------------
View
@@ -0,0 +1,90 @@
+== PVP-Arena v0.7 Changelog
+
+* v0.7.25.2 - cancel woolhead removal when needed
+* v0.7.25.1 - properly handle piston event protection
+* v0.7.25.0 - rewrite of /pa {arenaname} info
+* v0.7.24.0 - attempt to improve the statistics usage
+* v0.7.23.4 - fixed the woolhead removal - again
+* v0.7.23.3 - fix an issue with death events
+* v0.7.23.2 - fix late joining
+* v0.7.23.1 - fix freefight type issues, fix classitems messing causing NPEs
+* v0.7.23.0 - /pa [name] alive - list alive players
+* v0.7.22.2 - fix PotionEffects not being removed properly
+* v0.7.22.1 - more intelligent and extroverted help system
+* v0.7.22.0 - add readying of all teams with checkEachTeam: false
+* v0.7.21.0 - fix many issues inside modules
+* v0.7.20.13 - fix an NPE on non pvp death
+* v0.7.20.12 - add cylindric arena region shape
+* v0.7.20.11 - fix custom class not working
+* v0.7.20.10 - fix the end timer not deactivating PVP for losers
+* v0.7.20.8 - fix issues....
+* v0.7.20.7 - fix stuff and update for tank arena mode
+* v0.7.20.6 - fix alot of permissions issues oO
+* v0.7.20.5 - fix the wool head not being correctly secured
+* v0.7.20.4 - fix the ready up bug
+* v0.7.20.3 - fix various bugs
+* v0.7.20.2 - fix various bugs
+* v0.7.20.1 - fix teams/ctf/pumpkin lounge setting not working
+* v0.7.20.0 - feature freeze, future updates will just add/update modules or fix bugs
+* v0.7.19.5 - fix messy code about random spawns
+* v0.7.19.4 - fix teams/ctf/pumpkin spawn setting not working
+* v0.7.19.3 - fix region NPE
+* v0.7.19.2 - fix missing messages
+* v0.7.19.1 - fix multiple enchantments
+* v0.7.19.0 - command handling rewrite
+* v0.7.18.0 - region modules
+* v0.7.17.4 - fix chest restoring
+* v0.7.17.3 - make the countdown timer configurable
+* v0.7.17.2 - fix arenaboards displaying the global stats for players during a match
+* v0.7.17.1 - fix fluids and block burning not being cancellable/replaced properly
+* v0.7.17.0 - (more) correctly calculate armor in order to detect death
+* v0.7.16.1 - fix when teleporting players
+* v0.7.16.0 - more colors!
+* v0.7.15.0 - /pa readylist - to see people not being flagged as ready
+* v0.7.14.1 - add a delay to teleporting, making the player teleporting thread safe
+* v0.7.14.0 - teleport to spawns with /pa tp [spawnname]
+* v0.7.13.1 - FIRST restore blocks, then restore inventories!
+* v0.7.13.0 - add config setting to force warming up on /pa join | /pa spectate
+* v0.7.12.1 - fix /pa [name] remove [spawnname]
+* v0.7.12.0 - multiple Enchantments
+* v0.7.11.3 - add a different tracker
+* v0.7.11.2 - fix the player handling / inventory issue
+* v0.7.10.6 - fix the Loader
+* v0.7.10.5 - fix watching players not belonging to the arena
+* v0.7.10.4 - fix restoring of the team nameplate
+* v0.7.10.3 - fix timed (team) arenas giving no rewards
+* v0.7.10.2 - fix timed arenas totally f up
+* v0.7.10.1 - fix CraftBukkitUpToDate compatibility
+* v0.7.10.0 - add restoring of dispensers and furnaces
+* v0.7.9.22 - change game.allowDrops priority. Custom class not needed!
+* v0.7.9.21 - fix module loading
+* v0.7.9.20 - fix modules not containing version
+* v0.7.9.19 - fix player recognition -.-
+* v0.7.9.18 - fix spheric regions not being saved properly
+* v0.7.9.17 - fix all arena type ready methods
+* v0.7.9.16 - fix CTF/Pumpkin interact cancelling
+* v0.7.9.15 - hook inv shift click to protection.inventory
+* v0.7.9.14 - fix ColorTeams
+* v0.7.9.13 - fix CTF/Pumpkin arena returning "Flag set:" on many occasions ^^
+* v0.7.9.12 - fix mobs messing up the game. bad, bad mobs!
+* v0.7.9.11 - fix an NPE with activated quit check
+* v0.7.9.10 - fix ArenaBoards not working if spectators are present
+* v0.7.9.9 - fix many issues with invisible armor, players etc by disabling the team coloring function
+* v0.7.9.8 - fix team chat doubling
+* v0.7.9.7 - add customisable end timer, add damage cancelling
+* v0.7.9.6 - fix an NPE with /pa bet [player]
+* v0.7.9.5 - fix an NPE possible on arena end
+* v0.7.9.4 - fix more beta bugs
+* v0.7.9.2 - fix various bugs
+* v0.7.9 - rewrite concerning ArenaPlayer / Players
+* v0.7.8 - ArenaModule: Announcements
+* v0.7.7 - ArenaModule: TempPerms
+* v0.7.6 - ArenaModule: PowerUps
+* v0.7.5 - ArenaModule: VaultSupport
+* v0.7.4 - ArenaModule: Economy
+* v0.7.3 - ArenaModule: BlockRestore
+* v0.7.2 - ArenaModule: ColorTeams
+* v0.7.1 - ArenaModule: ArenaBoards
+* v0.7.0.3 - Kick leads to arena leave
+* v0.7.0.2 - Chest restoring
+* v0.7 - another huge rewrite, modules that provide Arena Types
@@ -420,7 +420,7 @@ public ArenaModuleManager getAmm() {
private class WrapPlotter extends Metrics.Plotter {
public WrapPlotter(String name) {
- super();
+ super(name);
}
public int getValue() {
@@ -17,7 +17,6 @@
import net.slipcor.pvparena.events.PAJoinEvent;
import net.slipcor.pvparena.events.PALeaveEvent;
import net.slipcor.pvparena.events.PAStartEvent;
-import net.slipcor.pvparena.listeners.EntityListener;
import net.slipcor.pvparena.managers.Configs;
import net.slipcor.pvparena.managers.Arenas;
import net.slipcor.pvparena.managers.Inventories;
@@ -907,11 +906,6 @@ public void respawnPlayer(Player player, int lives, DamageCause cause,
player.setExhaustion((float) cfg.getDouble("start.exhaustion", 0.0));
ArenaPlayer ap = ArenaPlayer.parsePlayer(player);
- if (cfg.getBoolean("game.refillInventory")
- && !ap.getClass().equals("custom")) {
- Inventories.clearInventory(player);
- Inventories.givePlayerFightItems(this, player);
- }
ArenaTeam team = Teams.getTeam(this, ap);
if (team == null) {
@@ -922,7 +916,7 @@ public void respawnPlayer(Player player, int lives, DamageCause cause,
player.setFireTicks(0);
player.setNoDamageTicks(60);
- EntityListener.addBurningPlayer(player);
+ //EntityListener.addBurningPlayer(player);
}
/**
@@ -39,6 +39,7 @@
HELMETS_TYPE.add(Material.CHAINMAIL_HELMET);
HELMETS_TYPE.add(Material.IRON_HELMET);
HELMETS_TYPE.add(Material.DIAMOND_HELMET);
+ HELMETS_TYPE.add(Material.WOOL);
CHESTPLATES_TYPE.add(Material.LEATHER_CHESTPLATE);
CHESTPLATES_TYPE.add(Material.GOLD_CHESTPLATE);
@@ -3,7 +3,6 @@
import java.util.Collection;
import net.slipcor.pvparena.PVPArena;
-import net.slipcor.pvparena.listeners.EntityListener;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
@@ -96,7 +95,7 @@ public void unload() {
player.addPotionEffects(potionEffects);
ArenaPlayer.parsePlayer(player).setTelePass(false);
- EntityListener.addBurningPlayer(player);
+ //EntityListener.addBurningPlayer(player);
player.setFireTicks(fireticks);
player.setNoDamageTicks(60);
}
@@ -117,17 +117,20 @@ public void commit(Arena arena, CommandSender player, String[] args) {
player.sendMessage("");
player.sendMessage(StringParser.colorVar("Protection",
- arena.cfg.getBoolean("protection.enabled", true))
- + ": "
- + StringParser.colorVar("firespread",
- arena.cfg.getBoolean("protection.firespread", true))
+ arena.cfg.getBoolean("protection.enabled", true)));
+
+ player.sendMessage(StringParser.colorVar("firespread",
+ arena.cfg.getBoolean("protection.firespread", true))
+ " | "
+ StringParser.colorVar("blockdamage",
arena.cfg.getBoolean("protection.blockdamage", true))
+ " | "
+ StringParser.colorVar("blockplace",
arena.cfg.getBoolean("protection.blockplace", true))
+ " | "
+ + StringParser.colorVar("piston",
+ arena.cfg.getBoolean("protection.piston", true))
+ + " | "
+ StringParser.colorVar("lighter",
arena.cfg.getBoolean("protection.lighter", true))
+ " | "
@@ -144,7 +144,7 @@ public void onBlockPistonExtend(BlockPistonExtendEvent event) {
db.i("block piston extend inside the arena");
if (arena.edit || (!(arena.cfg.getBoolean("protection.enabled", true)))
- || (!(arena.cfg.getBoolean("protection.blockdamage", true)))) {
+ || (!(arena.cfg.getBoolean("protection.piston", true)))) {
for (Block block : event.getBlocks()) {
PVPArena.instance.getAmm().onBlockPiston(arena, block);
Oops, something went wrong.

0 comments on commit 5371b1e

Please sign in to comment.