EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-12-16 05:58:47 +01:00
Code Issues Projects Releases Wiki Activity

Refactoring a bunch of stuff, more refactoring to come

Browse Source
This commit is contained in:
nossr50
2020-08-17 21:15:27 -07:00
parent 0e9e1f5133
commit daada1a643
161 changed files with 1934 additions and 2575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java
View File

@@ -13,10 +13,10 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
public class ChimaeraWingWarmup extends BukkitRunnable {
private final McMMOPlayer mcMMOPlayer;
private final McMMOPlayer mmoPlayer;
public ChimaeraWingWarmup(McMMOPlayer mcMMOPlayer) {
this.mcMMOPlayer = mcMMOPlayer;
public ChimaeraWingWarmup(McMMOPlayer mmoPlayer) {
this.mmoPlayer = mmoPlayer;
}
@Override
@@ -25,12 +25,12 @@ public class ChimaeraWingWarmup extends BukkitRunnable {
}
private void checkChimaeraWingTeleport() {
Player player = mcMMOPlayer.getPlayer();
Location previousLocation = mcMMOPlayer.getTeleportCommenceLocation();
Player player = mmoPlayer.getPlayer();
Location previousLocation = mmoPlayer.getTeleportCommenceLocation();
if (player.getLocation().distanceSquared(previousLocation) > 1.0 || !player.getInventory().containsAtLeast(ChimaeraWing.getChimaeraWing(0), 1)) {
player.sendMessage(LocaleLoader.getString("Teleport.Cancelled"));
mcMMOPlayer.setTeleportCommenceLocation(null);
mmoPlayer.setTeleportCommenceLocation(null);
return;
}
@@ -41,7 +41,7 @@ public class ChimaeraWingWarmup extends BukkitRunnable {
return;
}
long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
long recentlyHurt = mmoPlayer.getRecentlyHurtTimestamp();
int hurtCooldown = Config.getInstance().getChimaeraRecentlyHurtCooldown();
if (hurtCooldown > 0) {

19
src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java
View File

@@ -3,7 +3,6 @@ package com.gmail.nossr50.runnables.items;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
@@ -14,25 +13,25 @@ import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
public class TeleportationWarmup extends BukkitRunnable {
private final McMMOPlayer mcMMOPlayer;
private final McMMOPlayer mmoPlayer;
private final McMMOPlayer mcMMOTarget;
public TeleportationWarmup(McMMOPlayer mcMMOPlayer, McMMOPlayer mcMMOTarget) {
this.mcMMOPlayer = mcMMOPlayer;
public TeleportationWarmup(McMMOPlayer mmoPlayer, McMMOPlayer mcMMOTarget) {
this.mmoPlayer = mmoPlayer;
this.mcMMOTarget = mcMMOTarget;
}
@Override
public void run() {
Player teleportingPlayer = mcMMOPlayer.getPlayer();
Player teleportingPlayer = mmoPlayer.getPlayer();
Player targetPlayer = mcMMOTarget.getPlayer();
Location previousLocation = mcMMOPlayer.getTeleportCommenceLocation();
Location newLocation = mcMMOPlayer.getPlayer().getLocation();
long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
Location previousLocation = mmoPlayer.getTeleportCommenceLocation();
Location newLocation = mmoPlayer.getPlayer().getLocation();
long recentlyHurt = mmoPlayer.getRecentlyHurtTimestamp();
mcMMOPlayer.setTeleportCommenceLocation(null);
mmoPlayer.setTeleportCommenceLocation(null);
if (!PartyManager.inSameParty(teleportingPlayer, targetPlayer)) {
if (!mcMMO.getPartyManager().inSameParty(teleportingPlayer, targetPlayer)) {
teleportingPlayer.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetPlayer.getName()));
return;
}