mirror of
https://github.com/TotalFreedomMC/TotalFreedomMod.git
synced 2024-05-20 03:21:24 +00:00
c4fce3f0f9
* Command_adminworld.java * Command_adventure.java * Command_banip.java * Command_blockedit.java * Command_blockpvp.java * Command_cage.java * Command_cartsit.java * Command_clearchat.java * Command_clearinventory.java * Command_commandlist.java * Command_creative.java * Command_deop.java * Command_deopall.java * Command_dispfill.java * Command_doom.java * Command_gcmd.java * Command_hubworld.java * Command_inspect.java * Command_list.java * Command_lockup.java * Command_manageshop.java * Command_manuallyverify.java * Command_masterbuilderworld.java * Command_mbconfig.java * Command_moblimiter.java * Command_mp44.java * Command_mute.java * Command_nickfilter.java * Command_op.java * Command_opall.java * Command_opme.java * Command_potion.java (Also corrected the inconsistent "player not found" message's color) * Command_rank.java * Command_ride.java * Command_saconfig.java * Command_scare.java * Command_setplayerlimit.java * Command_settotalvotes.java * Command_smite.java * Command_spectator.java * Command_survival.java * Command_unblockcmd.java * Command_uncage.java * Command_unmute.java * Command_verifynoadmin.java Here are some commands I added functionality to: * Command_dispfill.java: Added some code that hooks into the CoreProtect API to log the items being removed from and added into the dispensers. * Command_setlever.java: Added some code that hooks into the CoreProtect API to log the levers being interacted with. Here's a command I fixed a critical bug in: * Command_setlever.java
77 lines
2.4 KiB
Java
77 lines
2.4 KiB
Java
package me.totalfreedom.totalfreedommod.command;
|
|
|
|
import java.util.Objects;
|
|
import me.totalfreedom.totalfreedommod.rank.Rank;
|
|
import org.bukkit.command.Command;
|
|
import org.bukkit.command.CommandSender;
|
|
import org.bukkit.entity.Minecart;
|
|
import org.bukkit.entity.Player;
|
|
|
|
@CommandPermissions(level = Rank.NON_OP, source = SourceType.BOTH)
|
|
@CommandParameters(description = "Sit in nearest minecart. If target is in a minecart already, they will disembark.", usage = "/<command> [partialname]")
|
|
public class Command_cartsit extends FreedomCommand
|
|
{
|
|
|
|
@Override
|
|
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
|
|
{
|
|
Player targetPlayer = playerSender;
|
|
|
|
if (args.length == 1 && plugin.al.isAdmin(sender))
|
|
{
|
|
targetPlayer = getPlayer(args[0]);
|
|
|
|
if (targetPlayer == null)
|
|
{
|
|
msg(PLAYER_NOT_FOUND);
|
|
return true;
|
|
}
|
|
}
|
|
|
|
if (senderIsConsole)
|
|
{
|
|
if (targetPlayer == null)
|
|
{
|
|
msg("When used from the console, you must define a target player: /cartsit <player>");
|
|
return true;
|
|
}
|
|
}
|
|
|
|
if (targetPlayer.isInsideVehicle())
|
|
{
|
|
Objects.requireNonNull(targetPlayer.getVehicle()).eject();
|
|
}
|
|
else
|
|
{
|
|
Minecart nearest_cart = null;
|
|
for (Minecart cart : targetPlayer.getWorld().getEntitiesByClass(Minecart.class))
|
|
{
|
|
if (cart.isEmpty())
|
|
{
|
|
if (nearest_cart == null)
|
|
{
|
|
nearest_cart = cart;
|
|
}
|
|
else
|
|
{
|
|
if (cart.getLocation().distanceSquared(targetPlayer.getLocation()) < nearest_cart.getLocation().distanceSquared(targetPlayer.getLocation()))
|
|
{
|
|
nearest_cart = cart;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (nearest_cart != null)
|
|
{
|
|
nearest_cart.addPassenger(targetPlayer);
|
|
}
|
|
else
|
|
{
|
|
msg("There are no empty minecarts in the target world.");
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
} |