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

Reworked Party

Browse Source
This commit is contained in:
bm01
2012-06-08 23:48:41 +02:00
parent e9ccdcfbbe
commit 3732db2226
19 changed files with 743 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/combat/Axes.java
View File

@ -14,7 +14,7 @@ import org.bukkit.inventory.PlayerInventory;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;
@ -60,7 +60,7 @@ public class Axes {
if (tamer instanceof Player) {
Player owner = (Player) tamer;
if (owner == attacker || Party.getInstance().inSameParty(attacker, owner)) {
if (owner == attacker || PartyManager.getInstance().inSameParty(attacker, owner)) {
return;
}
}

4
src/main/java/com/gmail/nossr50/skills/combat/Swords.java
View File

@ -11,7 +11,7 @@ import org.bukkit.entity.Tameable;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.util.Combat;
import com.gmail.nossr50.util.ItemChecks;
@ -39,7 +39,7 @@ public class Swords {
if (tamer instanceof Player) {
Player owner = (Player) tamer;
if (owner == attacker || Party.getInstance().inSameParty(attacker, owner)) {
if (owner == attacker || PartyManager.getInstance().inSameParty(attacker, owner)) {
return;
}
}

4
src/main/java/com/gmail/nossr50/skills/misc/Acrobatics.java
View File

@ -9,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
@ -96,7 +96,7 @@ public class Acrobatics {
if (event.getDamager() instanceof Player) {
Player attacker = (Player) event.getDamager();
if (Party.getInstance().inSameParty(defender, attacker)) {
if (PartyManager.getInstance().inSameParty(defender, attacker)) {
return;
}
}