AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-11 13:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update NMS + Use PaperLib for teleportAsync

Browse Source
This commit is contained in:
Telesphoreo
2020-08-30 19:13:46 -05:00
parent c61f7e78fd
commit 43b266f17d
17 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java
View File

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import io.papermc.lib.PaperLib;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -72,7 +73,7 @@ public class Command_hubworld extends FreedomCommand
if (hubWorld == null || playerSender.getWorld() == hubWorld)
{
msg("Going to the main world.");
playerSender.teleport(server.getWorlds().get(0).getSpawnLocation());
PaperLib.teleportAsync(playerSender, server.getWorlds().get(0).getSpawnLocation());
}
else
{

3
src/main/java/me/totalfreedom/totalfreedommod/command/Command_localspawn.java
View File

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import io.papermc.lib.PaperLib;
import me.totalfreedom.totalfreedommod.rank.Rank;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@ -12,7 +13,7 @@ public class Command_localspawn extends FreedomCommand
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
playerSender.teleport(playerSender.getWorld().getSpawnLocation());
PaperLib.teleportAsync(playerSender, playerSender.getWorld().getSpawnLocation());
msg("Teleported to spawnpoint for world \"" + playerSender.getWorld().getName() + "\".");
return true;
}

3
src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java
View File

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import io.papermc.lib.PaperLib;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -72,7 +73,7 @@ public class Command_masterbuilderworld extends FreedomCommand
if (masterBuilderWorld == null || playerSender.getWorld() == masterBuilderWorld)
{
msg("Going to the main world.");
playerSender.teleport(server.getWorlds().get(0).getSpawnLocation());
PaperLib.teleportAsync(playerSender, server.getWorlds().get(0).getSpawnLocation());
}
else
{

10
src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java
View File

@ -5,13 +5,13 @@ import java.util.List;
import java.util.Random;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import net.minecraft.server.v1_16_R1.NBTTagCompound;
import net.minecraft.server.v1_16_R1.NBTTagList;
import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R2.NBTTagList;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Material;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@ -149,7 +149,7 @@ public class Command_modifyitem extends FreedomCommand
{
return false;
}
net.minecraft.server.v1_16_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
net.minecraft.server.v1_16_R2.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
NBTTagCompound compound = (nmsStack.hasTag()) ? nmsStack.getTag() : new NBTTagCompound();
NBTTagList modifiers = getAttributeList(nmsStack);
NBTTagCompound cmpnd = new NBTTagCompound();
@ -199,7 +199,7 @@ public class Command_modifyitem extends FreedomCommand
return true;
}
private NBTTagList getAttributeList(net.minecraft.server.v1_16_R1.ItemStack stack)
private NBTTagList getAttributeList(net.minecraft.server.v1_16_R2.ItemStack stack)
{
if (stack.getTag() == null)
{

4
src/main/java/me/totalfreedom/totalfreedommod/command/Command_plotworld.java
View File

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import io.papermc.lib.PaperLib;
import me.totalfreedom.totalfreedommod.rank.Rank;
import org.bukkit.World;
import org.bukkit.command.Command;
@ -10,14 +11,13 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Go to the PlotWorld.", usage = "/<command>", aliases = "pw")
public class Command_plotworld extends FreedomCommand
{
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
World plotworld = server.getWorld("plotworld");
if (plotworld != null)
{
playerSender.teleport(plotworld.getSpawnLocation());
PaperLib.teleportAsync(playerSender, plotworld.getSpawnLocation());
}
else
{

5
src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java
View File

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import io.papermc.lib.PaperLib;
import java.util.HashMap;
import java.util.Map;
import java.util.TimerTask;
@ -55,7 +56,7 @@ public class Command_ride extends FreedomCommand
if (requester.getWorld() != playerSender.getWorld())
{
requester.teleport(playerSender);
PaperLib.teleportAsync(requester, playerSender.getLocation());
}
playerSender.addPassenger(requester);
@ -145,7 +146,7 @@ public class Command_ride extends FreedomCommand
if (player.getWorld() != playerSender.getWorld())
{
playerSender.teleport(player);
PaperLib.teleportAsync(playerSender, player.getLocation());
}
player.addPassenger(playerSender);

3
src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectate.java
View File

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import io.papermc.lib.PaperLib;
import me.totalfreedom.totalfreedommod.rank.Rank;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
@ -40,7 +41,7 @@ public class Command_spectate extends FreedomCommand
if (playerSender.getWorld() != player.getWorld())
{
playerSender.teleport(player);
PaperLib.teleportAsync(playerSender, player.getLocation());
}
playerSender.setSpectatorTarget(player);

3
src/main/java/me/totalfreedom/totalfreedommod/command/Command_staffworld.java
View File

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import io.papermc.lib.PaperLib;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -72,7 +73,7 @@ public class Command_staffworld extends FreedomCommand
if (staffWorld == null || playerSender.getWorld() == staffWorld)
{
msg("Going to the main world.");
playerSender.teleport(server.getWorlds().get(0).getSpawnLocation());
PaperLib.teleportAsync(playerSender, server.getWorlds().get(0).getSpawnLocation());
}
else
{

3
src/main/java/me/totalfreedom/totalfreedommod/command/Command_tprandom.java
View File

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import io.papermc.lib.PaperLib;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.ChatColor;
@ -19,7 +20,7 @@ public class Command_tprandom extends FreedomCommand
int z = FUtil.randomInteger(-50000, 50000);
int y = playerSender.getWorld().getHighestBlockYAt(x, z);
Location location = new Location(playerSender.getLocation().getWorld(), x, y, z);
playerSender.teleport(location);
PaperLib.teleportAsync(playerSender, location);
msg("Poof!", ChatColor.GREEN);
return true;
}