From c74f43a1ad1bf78310c66e42adb2273f0e20ad80 Mon Sep 17 00:00:00 2001 From: NuclearW Date: Wed, 22 Feb 2012 06:19:18 -0500 Subject: [PATCH] Change Changelog to + = ! - system Cleanup some unneded SuppressWarnings Monitor is where events that we don't cancel go, also we ignore cancelled events --- Changelog.txt | 44 +++++++++++-------- .../events/FakeEntityDamageByEntityEvent.java | 1 - .../nossr50/events/McMMOItemSpawnEvent.java | 1 - .../events/McMMOPlayerLevelUpEvent.java | 1 - .../events/McMMOPlayerXpGainEvent.java | 1 - .../nossr50/listeners/mcPlayerListener.java | 2 +- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 3ef477444..5ec60678e 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,25 +1,31 @@ Changelog: -#Versions without changelogs probably had very small misc fixes, like tweaks to the source code +Versions without changelogs probably had very small misc fixes, like tweaks to the source code + +Key: + + Addition + = Fix + ! Change + - Removal Version 1.3.00-dev - - Added ability to customize drops for Excavation skill - - Added ability to customize drops for Fishing skill - - Added player notification for when they stop Bleeding - - Added configuration option to control mcMMO reporting damage events - - Added hunger regain bonuses to Herbalism skill - - Added framework for new Blast Mining skill - - Added Fast Food Service subskill to Taming - - Re-added mcMMO reporting damage events - - Fixed /mcability not respecting permissions - - Changed god mode to turn off if player enters world where he does not have mcgod permission - - Changed Taming to also gain XP from shearing - - Changed Taming to also gain XP from animal taming - - Changed Swords Bleeding effect to never kill - - Changed Bleeding to never go beyond 10 ticks - - Changed to use Bukkit's built-in ignoreCancelledEvents system - - Changed chat logging for /p & /a - - Changed Tree Feller to use per-use ArrayList - - Prettied up new config files + + Added ability to customize drops for Excavation skill + + Added ability to customize drops for Fishing skill + + Added player notification for when they stop Bleeding + + Added configuration option to control mcMMO reporting damage events + + Added hunger regain bonuses to Herbalism skill + + Added framework for new Blast Mining skill + + Added Fast Food Service subskill to Taming + + Re-added mcMMO reporting damage events + = Fixed /mcability not respecting permissions + = Prettied up new config files + ! Changed god mode to turn off if player enters world where he does not have mcgod permission + ! Changed Taming to also gain XP from shearing + ! Changed Taming to also gain XP from animal taming + ! Changed Swords Bleeding effect to never kill + ! Changed Bleeding to never go beyond 10 ticks + ! Changed to use Bukkit's built-in ignoreCancelledEvents system + ! Changed chat logging for /p & /a + ! Changed Tree Feller to use per-use ArrayList - Removed Master/Apprentice chat notifications to reduce spam - Removed duplicate settings in config.yml - Removed unused settings from config.yml (HP Regen) diff --git a/src/main/java/com/gmail/nossr50/events/FakeEntityDamageByEntityEvent.java b/src/main/java/com/gmail/nossr50/events/FakeEntityDamageByEntityEvent.java index 8ff2fb292..bc2749318 100644 --- a/src/main/java/com/gmail/nossr50/events/FakeEntityDamageByEntityEvent.java +++ b/src/main/java/com/gmail/nossr50/events/FakeEntityDamageByEntityEvent.java @@ -3,7 +3,6 @@ package com.gmail.nossr50.events; import org.bukkit.entity.Entity; import org.bukkit.event.entity.EntityDamageByEntityEvent; -@SuppressWarnings("serial") public class FakeEntityDamageByEntityEvent extends EntityDamageByEntityEvent { public FakeEntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, int damage) { super(damager, damagee, cause, damage); diff --git a/src/main/java/com/gmail/nossr50/events/McMMOItemSpawnEvent.java b/src/main/java/com/gmail/nossr50/events/McMMOItemSpawnEvent.java index bbf2705e9..6c624b5e5 100644 --- a/src/main/java/com/gmail/nossr50/events/McMMOItemSpawnEvent.java +++ b/src/main/java/com/gmail/nossr50/events/McMMOItemSpawnEvent.java @@ -25,7 +25,6 @@ import org.bukkit.inventory.ItemStack; /** * Called when mcMMO is preparing to drop an item */ -@SuppressWarnings("serial") public class McMMOItemSpawnEvent extends Event implements Cancellable { private Location location; private ItemStack itemStack; diff --git a/src/main/java/com/gmail/nossr50/events/McMMOPlayerLevelUpEvent.java b/src/main/java/com/gmail/nossr50/events/McMMOPlayerLevelUpEvent.java index 3a4a1fa6a..0abc3b6ed 100644 --- a/src/main/java/com/gmail/nossr50/events/McMMOPlayerLevelUpEvent.java +++ b/src/main/java/com/gmail/nossr50/events/McMMOPlayerLevelUpEvent.java @@ -25,7 +25,6 @@ import com.gmail.nossr50.datatypes.SkillType; /** * Called when a user levels up in a skill */ -@SuppressWarnings("serial") public class McMMOPlayerLevelUpEvent extends Event { private Player player; private SkillType skill; diff --git a/src/main/java/com/gmail/nossr50/events/McMMOPlayerXpGainEvent.java b/src/main/java/com/gmail/nossr50/events/McMMOPlayerXpGainEvent.java index c66c01d67..a5c4cb9ff 100644 --- a/src/main/java/com/gmail/nossr50/events/McMMOPlayerXpGainEvent.java +++ b/src/main/java/com/gmail/nossr50/events/McMMOPlayerXpGainEvent.java @@ -22,7 +22,6 @@ import org.bukkit.event.HandlerList; import com.gmail.nossr50.datatypes.SkillType; -@SuppressWarnings("serial") public class McMMOPlayerXpGainEvent extends Event { private Player player; private SkillType skill; diff --git a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java index cef67b270..bcb31db73 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java @@ -79,7 +79,7 @@ public class mcPlayerListener implements Listener plugin = instance; } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerWorldChangeEvent(PlayerChangedWorldEvent event) { Player player = event.getPlayer();