2
0
Эх сурвалжийг харах

Change Changelog to + = ! - system
Cleanup some unneded SuppressWarnings
Monitor is where events that we don't cancel go, also we ignore cancelled events

NuclearW 13 жил өмнө
parent
commit
c74f43a1ad

+ 25 - 19
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)

+ 0 - 1
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);

+ 0 - 1
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;

+ 0 - 1
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;

+ 0 - 1
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;

+ 1 - 1
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();