EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix for CraftOfflinePlayer in Taming yet again

Browse Source
This commit is contained in:
TheYeti 2012-03-08 11:33:27 -08:00
parent 7a549ce211
commit 714f829f3e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -16,6 +16,7 @@ Version 2.0.00-dev
= Fixed issue with Blast Mining not seeing TNT for detonation due to snow = Fixed issue with Blast Mining not seeing TNT for detonation due to snow
! Changed Call of the Wild to activate on left-click rather than right-click ! Changed Call of the Wild to activate on left-click rather than right-click
! Changed Blast Mining to track based on Entity ID vs. Location ! Changed Blast Mining to track based on Entity ID vs. Location
= Fix Taming to hopefully properly handle offline players....again
Version 1.3.02 Version 1.3.02
+ Added in game guides for Mining, Excavation, and Acrobatics. Simply type /skillname ? to access them + Added in game guides for Mining, Excavation, and Acrobatics. Simply type /skillname ? to access them

10
src/main/java/com/gmail/nossr50/skills/Taming.java
View File

@ -1,6 +1,7 @@
package com.gmail.nossr50.skills; package com.gmail.nossr50.skills;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@ -103,7 +104,14 @@ public class Taming
{ {
DamageCause cause = event.getCause(); DamageCause cause = event.getCause();
Wolf wolf = (Wolf) event.getEntity(); Wolf wolf = (Wolf) event.getEntity();
Player master = (Player) wolf.getOwner(); Player master;
if ( wolf.getOwner() instanceof Player ) {
master = (Player) wolf.getOwner();
}
else {
OfflinePlayer oMaster = (OfflinePlayer) wolf.getOwner();
master = (Player) oMaster.getPlayer();
}
int skillLevel = Users.getProfile(master).getSkillLevel(SkillType.TAMING); int skillLevel = Users.getProfile(master).getSkillLevel(SkillType.TAMING);
switch(cause) switch(cause)