EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-12-15 21:48:45 +01:00
Code Issues Projects Releases Wiki Activity

More API migration, feels like a mountain of work left lol

Browse Source
This commit is contained in:
nossr50
2020-12-22 17:27:25 -08:00
parent 73bc12841a
commit 4199ea0095
110 changed files with 2405 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package com.gmail.nossr50.runnables.items;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.ChimaeraWing;
@@ -13,9 +14,9 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
public class ChimaeraWingWarmup extends BukkitRunnable {
private final OnlineMMOPlayer mmoPlayer;
private final McMMOPlayer mmoPlayer;
public ChimaeraWingWarmup(OnlineMMOPlayer mmoPlayer) {
public ChimaeraWingWarmup(McMMOPlayer mmoPlayer) {
this.mmoPlayer = mmoPlayer;
}

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

@@ -1,6 +1,8 @@
package com.gmail.nossr50.runnables.items;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.mcMMO;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.EventUtils;
@@ -13,20 +15,20 @@ import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
public class TeleportationWarmup extends BukkitRunnable {
private final OnlineMMOPlayer mmoPlayer;
private final OnlineMMOPlayer mcMMOTarget;
private final McMMOPlayer mmoPlayer;
private final McMMOPlayer mcMMOTarget;
public TeleportationWarmup(OnlineMMOPlayer mmoPlayer, OnlineMMOPlayer mcMMOTarget) {
public TeleportationWarmup(McMMOPlayer mmoPlayer, McMMOPlayer mcMMOTarget) {
this.mmoPlayer = mmoPlayer;
this.mcMMOTarget = mcMMOTarget;
}
@Override
public void run() {
Player teleportingPlayer = mmoPlayer.getPlayer();
Player teleportingPlayer = Misc.adaptPlayer(mmoPlayer);
Player targetPlayer = mcMMOTarget.getPlayer();
Location previousLocation = mmoPlayer.getTeleportCommenceLocation();
Location newLocation = mmoPlayer.getPlayer().getLocation();
Location newLocation = Misc.adaptPlayer(mmoPlayer).getLocation();
long recentlyHurt = mmoPlayer.getRecentlyHurtTimestamp();
mmoPlayer.setTeleportCommenceLocation(null);