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

1.16 Update (#219)

Browse Source
This commit is contained in:
Seth
2020-07-09 17:07:03 -07:00
committed by GitHub
parent 4ddcc3b8d7
commit 7b7f09e457
189 changed files with 2912 additions and 4951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.TimerTask;
import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.Command;
@ -76,8 +77,9 @@ public class Command_ride extends FreedomCommand
{
if (args[1].equalsIgnoreCase("normal") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("ask"))
{
VPlayer vPlayerSender = plugin.pv.getVerificationPlayer(playerSender);
vPlayerSender.setRideMode(args[1].toLowerCase());
PlayerData playerDataSender = plugin.pl.getData(playerSender);
playerDataSender.setRideMode(args[1].toLowerCase());
plugin.pl.save(playerDataSender);
msg("Ride mode is now set to " + args[1].toLowerCase() + ".");
return true;
}
@ -90,7 +92,7 @@ public class Command_ride extends FreedomCommand
return true;
}
final VPlayer vPlayer = plugin.pv.getVerificationPlayer(player);
final PlayerData playerData = plugin.pl.getData(player);
if (player == playerSender)
{
@ -98,19 +100,13 @@ public class Command_ride extends FreedomCommand
return true;
}
if (vPlayer.getRideMode().equals("off") && !isAdmin(sender))
if (playerData.getRideMode().equals("off") && !isAdmin(sender))
{
msg("That player cannot be ridden.", ChatColor.RED);
return true;
}
if (player.getName().equals("Catholic_Mario"))
{
msg("no", ChatColor.RED);
return true;
}
if (vPlayer.getRideMode().equals("ask") && !isAdmin(sender))
if (playerData.getRideMode().equals("ask") && !FUtil.isExecutive(playerSender.getName()))
{
msg("Sent a request to the player.", ChatColor.GREEN);
player.sendMessage(ChatColor.AQUA + sender.getName() + " has requested to ride you.");
@ -118,7 +114,7 @@ public class Command_ride extends FreedomCommand
player.sendMessage(ChatColor.AQUA + "Type " + ChatColor.RED + "/ride deny" + ChatColor.AQUA + " to deny the player permission.");
player.sendMessage(ChatColor.AQUA + "Request will expire after 30 seconds.");
RIDE_REQUESTS.put(player, playerSender);
FreedomCommandExecutor.timer.schedule(new TimerTask()
timer.schedule(new TimerTask()
{
@Override
public void run()