EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-12-11 03:38:46 +01:00
Code Issues Projects Releases Wiki Activity

Remove Static Abuse - Scoreboards... (Yuck)

Browse Source
This commit is contained in:
nossr50
2019-07-02 21:12:50 -07:00
parent e7b80cbce5
commit 5ec59536c7
103 changed files with 696 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/gmail/nossr50/party/PartyManager.java
View File

@@ -11,7 +11,6 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.items.TeleportationWarmup;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.player.UserManager;
import com.gmail.nossr50.util.sounds.SoundManager;
import com.gmail.nossr50.util.sounds.SoundType;
import org.bukkit.OfflinePlayer;
@@ -38,7 +37,7 @@ public final class PartyManager {
}
public boolean canTeleport(CommandSender sender, Player player, String targetName) {
McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
McMMOPlayer mcMMOTarget = pluginRef.getUserManager().getPlayer(targetName);
if (!pluginRef.getCommandTools().checkPlayerExistence(sender, targetName, mcMMOTarget)) {
return false;
@@ -70,18 +69,18 @@ public final class PartyManager {
}
public void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) {
if (UserManager.getPlayer(targetPlayer) == null) {
if (pluginRef.getUserManager().getPlayer(targetPlayer) == null) {
targetPlayer.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
return;
}
if (UserManager.getPlayer(teleportingPlayer) == null) {
if (pluginRef.getUserManager().getPlayer(teleportingPlayer) == null) {
teleportingPlayer.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
return;
}
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetPlayer);
McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(teleportingPlayer);
McMMOPlayer mcMMOTarget = pluginRef.getUserManager().getPlayer(targetPlayer);
long warmup = pluginRef.getConfigManager().getConfigParty().getPTP().getPtpWarmup();
@@ -172,17 +171,17 @@ public final class PartyManager {
return false;
//Profile not loaded
if (UserManager.getPlayer(firstPlayer) == null) {
if (pluginRef.getUserManager().getPlayer(firstPlayer) == null) {
return false;
}
//Profile not loaded
if (UserManager.getPlayer(secondPlayer) == null) {
if (pluginRef.getUserManager().getPlayer(secondPlayer) == null) {
return false;
}
Party firstParty = UserManager.getPlayer(firstPlayer).getParty();
Party secondParty = UserManager.getPlayer(secondPlayer).getParty();
Party firstParty = pluginRef.getUserManager().getPlayer(firstPlayer).getParty();
Party secondParty = pluginRef.getUserManager().getPlayer(secondPlayer).getParty();
if (firstParty == null || secondParty == null) {
return false;
@@ -197,17 +196,17 @@ public final class PartyManager {
return false;
//Profile not loaded
if (UserManager.getPlayer(firstPlayer) == null) {
if (pluginRef.getUserManager().getPlayer(firstPlayer) == null) {
return false;
}
//Profile not loaded
if (UserManager.getPlayer(secondPlayer) == null) {
if (pluginRef.getUserManager().getPlayer(secondPlayer) == null) {
return false;
}
Party firstParty = UserManager.getPlayer(firstPlayer).getParty();
Party secondParty = UserManager.getPlayer(secondPlayer).getParty();
Party firstParty = pluginRef.getUserManager().getPlayer(firstPlayer).getParty();
Party secondParty = pluginRef.getUserManager().getPlayer(secondPlayer).getParty();
if (firstParty == null || secondParty == null || firstParty.getAlly() == null || secondParty.getAlly() == null) {
return false;
@@ -373,11 +372,11 @@ public final class PartyManager {
*/
public Party getParty(Player player) {
//Profile not loaded
if (UserManager.getPlayer(player) == null) {
if (pluginRef.getUserManager().getPlayer(player) == null) {
return null;
}
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
return mcMMOPlayer.getParty();
}
@@ -438,11 +437,11 @@ public final class PartyManager {
//TODO: Potential issues with unloaded profile?
for (Player member : party.getOnlineMembers()) {
//Profile not loaded
if (UserManager.getPlayer(member) == null) {
if (pluginRef.getUserManager().getPlayer(member) == null) {
continue;
}
processPartyLeaving(UserManager.getPlayer(member));
processPartyLeaving(pluginRef.getUserManager().getPlayer(member));
}
// Disband the alliance between the disbanded party and it's ally

13
src/main/java/com/gmail/nossr50/party/ShareHandler.java
View File

@@ -9,7 +9,6 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.player.UserManager;
import org.bukkit.Material;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
@@ -55,11 +54,11 @@ public final class ShareHandler {
for (Player member : nearMembers) {
//Profile not loaded
if (UserManager.getPlayer(member) == null) {
if (pluginRef.getUserManager().getPlayer(member) == null) {
continue;
}
UserManager.getPlayer(member).beginUnsharedXpGain(primarySkillType, splitXp, xpGainReason, XPGainSource.PARTY_MEMBERS);
pluginRef.getUserManager().getPlayer(member).beginUnsharedXpGain(primarySkillType, splitXp, xpGainReason, XPGainSource.PARTY_MEMBERS);
}
return true;
@@ -113,10 +112,10 @@ public final class ShareHandler {
int highestRoll = 0;
for (Player member : nearMembers) {
McMMOPlayer mcMMOMember = UserManager.getPlayer(member);
McMMOPlayer mcMMOMember = pluginRef.getUserManager().getPlayer(member);
//Profile not loaded
if (UserManager.getPlayer(member) == null) {
if (pluginRef.getUserManager().getPlayer(member) == null) {
continue;
}
@@ -131,14 +130,14 @@ public final class ShareHandler {
highestRoll = diceRoll;
if (winningPlayer != null) {
McMMOPlayer mcMMOWinning = UserManager.getPlayer(winningPlayer);
McMMOPlayer mcMMOWinning = pluginRef.getUserManager().getPlayer(winningPlayer);
mcMMOWinning.setItemShareModifier(mcMMOWinning.getItemShareModifier() + itemWeight);
}
winningPlayer = member;
}
McMMOPlayer mcMMOTarget = UserManager.getPlayer(winningPlayer);
McMMOPlayer mcMMOTarget = pluginRef.getUserManager().getPlayer(winningPlayer);
mcMMOTarget.setItemShareModifier(mcMMOTarget.getItemShareModifier() - itemWeight);
awardDrop(winningPlayer, newStack);
}