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

Removed isNPCPlayer, isNPCEntity is identical

Browse Source
This commit is contained in:
bm01
2013-02-19 01:46:50 +01:00
parent 519485f155
commit ad68f50b14
8 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ public final class CombatTools {
if (attacker instanceof Player) {
Player player = (Player) attacker;
if (Misc.isNPCPlayer(player)) {
if (Misc.isNPCEntity(player)) {
return;
}
@ -193,7 +193,7 @@ public final class CombatTools {
if (wolf.isTamed() && wolf.getOwner() instanceof Player) {
Player master = (Player) wolf.getOwner();
if (Misc.isNPCPlayer(master)) {
if (Misc.isNPCEntity(master)) {
return;
}
@ -256,7 +256,7 @@ public final class CombatTools {
if (targetIsPlayer) {
Player player = (Player) target;
if (Misc.isNPCPlayer(player)) {
if (Misc.isNPCEntity(player)) {
return;
}
@ -295,7 +295,7 @@ public final class CombatTools {
* @param event The event to run the archery checks on.
*/
private static void archeryCheck(Player shooter, LivingEntity target, EntityDamageByEntityEvent event) {
if (Misc.isNPCPlayer(shooter)) {
if (Misc.isNPCEntity(shooter)) {
return;
}