mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-22 21:26:46 +01:00
Citizens compatibility. Bug fix for Woodcutting/custom trees.
This commit is contained in:
parent
3934392219
commit
7b47d32a96
@ -8,6 +8,8 @@ Key:
|
||||
- Removal
|
||||
|
||||
Version 1.3.11
|
||||
+ Added compatibility with bow-wielding NPCs from Citizens/NPC mods
|
||||
= Fixed bug where mcMMO could throw NPE errors if trees cut down were from a custom mod and had an id of 17
|
||||
= Fixed bug where mcMMO would ignore other block-protection plugins for various abilities
|
||||
|
||||
Version 1.3.10
|
||||
|
@ -18,6 +18,11 @@ public class ArcheryManager {
|
||||
public ArcheryManager (Player player) {
|
||||
this.player = player;
|
||||
this.profile = Users.getProfile(player);
|
||||
|
||||
//Compatibility with Citizens, Citizens NPCs won't create a profile so we'll check for it here
|
||||
if(this.profile == null)
|
||||
return;
|
||||
|
||||
this.skillLevel = profile.getSkillLevel(SkillType.ARCHERY);
|
||||
this.permissionsInstance = Permissions.getInstance();
|
||||
}
|
||||
|
@ -385,6 +385,11 @@ public class WoodCutting {
|
||||
}
|
||||
else {
|
||||
TreeSpecies species = TreeSpecies.getByData(block.getData());
|
||||
|
||||
//Apparently species can be null in certain cases (custom server mods?)
|
||||
//https://github.com/mcMMO-Dev/mcMMO/issues/229
|
||||
if(species == null)
|
||||
return;
|
||||
|
||||
switch (species) {
|
||||
case GENERIC:
|
||||
|
Loading…
Reference in New Issue
Block a user