EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 19:54:44 +02:00
Code Issues Projects Releases Wiki Activity

nope.avi

Browse Source 
Revert "Protect placeStore. It's ugly and still needs work."

This reverts commit 1fe182babe.
This commit is contained in:
NuclearW
2013-02-17 10:05:35 -05:00
parent f2b03896e2
commit 57e6e5400b
14 changed files with 46 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java
View File

@ -459,8 +459,8 @@ public final class CombatTools {
baseXP = 20 * configInstance.getPlayerVersusPlayerXP();
}
}
else if (!mcMMO.p.isSpawned(target)) {
if (target instanceof Animals) {
else if (!mcMMO.placeStore.isSpawnedMob(target)) {
if (target instanceof Animals && !mcMMO.placeStore.isSpawnedPet(target)) {
if (ModChecks.isCustomEntity(target)) {
baseXP = ModChecks.getCustomEntity(target).getXpMultiplier();
}