TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 11:49:12 +00:00
Code Issues Projects Releases Wiki Activity

update for the tfm staff refactor

Browse source
This commit is contained in:
Telesphoreo 2020-08-15 19:53:50 -05:00
parent 6ba2065104
commit 0f4f6971a8
5 changed files with 24 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Essentials/src/com/earth2me/essentials/OfflinePlayer.java
View file

@ -1641,6 +1641,12 @@ public class OfflinePlayer implements Player {
public void setShoulderEntityRight(Entity entity) {
}
@Override
public boolean dropItem(boolean b)
{
return false;
}
@Override
public double getHeight() {
return 0;

98
Essentials/src/com/earth2me/essentials/TFMHandler.java
View file

@ -1,7 +1,7 @@
package com.earth2me.essentials;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.admin.AdminList;
import me.totalfreedom.totalfreedommod.staff.StaffList;
import me.totalfreedom.totalfreedommod.util.FLog;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -40,17 +40,17 @@ public class TFMHandler
public boolean isAdmin(User user)
{
return getTFM().al.isAdmin(user.getBase());
return getTFM().sl.isAdmin(user.getBase());
}
public boolean isAdmin(CommandSender sender)
{
return getTFM().al.isAdmin(sender);
return getTFM().sl.isAdmin(sender);
}
public boolean isAdmin(Player player)
{
return getTFM().al.isAdmin(player);
return getTFM().sl.isAdmin(player);
}
public boolean isVanished(User user)
@ -64,7 +64,7 @@ public class TFMHandler
{
getTFM();
}
return AdminList.vanished.contains(player.getName());
return StaffList.vanished.contains(player.getName());
}
public void warning(String warning)
@ -84,92 +84,4 @@ public class TFMHandler
}
FLog.info(info);
}
/*
private static Logger logger;
private static Function<Player, Boolean> adminProvider;
private static Function<Player, Boolean> vanishProvider;
public static void setLogger(Logger logger)
{
TFMHandler.logger = logger;
}
public static Plugin getTFM()
{
final Plugin tfm = Bukkit.getPluginManager().getPlugin("TotalFreedomMod");
if (tfm == null)
{
logger.warning("Could not resolve plugin: TotalFreedomMod");
}
return tfm;
}
public boolean isAdmin(User user)
{
return isAdmin(user.getBase());
}
@SuppressWarnings({"unchecked", "ConstantConditions"})
public boolean isAdmin(Player player)
{
if (adminProvider == null)
{
final Plugin tfm = getTFM();
if (tfm == null)
{
return false;
}
Object provider = null;
for (RegisteredServiceProvider<?> serv : Bukkit.getServicesManager().getRegistrations(tfm))
{
if (Function.class.isAssignableFrom(serv.getService()))
{
provider = serv.getProvider();
}
}
if (provider == null)
{
warning("Could not obtain admin service provider!");
return false;
}
adminProvider = (Function<Player, Boolean>) provider;
}
return adminProvider.apply(player);
}
public boolean isVanished(User user)
{
return isVanished(user.getBase());
}
@SuppressWarnings({"unchecked", "ConstantConditions"})
public boolean isVanished(Player player)
{
if (vanishProvider == null)
{
final Plugin tfm = getTFM();
if (tfm == null)
{
return false;
}
Object provider = null;
for (RegisteredServiceProvider<?> serv : Bukkit.getServicesManager().getRegistrations(tfm))
{
if (Function.class.isAssignableFrom(serv.getService()))
{
provider = serv.getProvider();
}
}
if (provider == null)
{
warning("Could not obtain vanish service provider!");
return false;
}
vanishProvider = (Function<Player, Boolean>) provider;
}
return vanishProvider.apply(player);
}
public static void warning(String warning)
{
logger.warning(warning);
}
public static void info(String info)
{
logger.info(info);
}
*/
}

3
Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java
View file

@ -28,6 +28,8 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand {
throw new PlayerNotFoundException();
}
matchWildcards = getTFMHandler().isAdmin(sender.getPlayer());
final UUID uuid = StringUtil.toUUID(searchTerm);
if (uuid != null) {
final User matchedUser = ess.getUser(uuid);
@ -73,6 +75,7 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand {
throw new PlayerNotFoundException();
}
matchWildcards = getTFMHandler().isAdmin(sender.getPlayer());
boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).canInteractVanished();
if (matchWildcards && (searchTerm.contentEquals("**") || searchTerm.contentEquals("*"))) {

8
Essentials/src/plugin.yml
View file

@ -300,10 +300,10 @@ commands:
# description: May death rain upon them.
# usage: /<command> [player]
# aliases: [enuke]
tpoffline:
description: Teleport to a player's last known logout location
usage: /<command> <player>
aliases: [otp, offlinetp, tpoff, tpoffline]
# tpoffline:
# description: Teleport to a player's last known logout location
# usage: /<command> <player>
# aliases: [otp, offlinetp, tpoff, tpoffline]
pay:
description: Pays another player from your balance.
usage: /<command> <player> <amount>

8
pom.xml
View file

@ -39,6 +39,10 @@
<id>jitpack</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>telesphoreo-repo</id>
<url>https://telesphoreo.me/repo/maven</url>
</repository>
</repositories>
<modules>
@ -70,9 +74,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.TFPatches</groupId>
<groupId>me.totalfreedom</groupId>
<artifactId>TotalFreedomMod</artifactId>
<version>server-SNAPSHOT</version>
<version>2020.9</version>
<scope>provided</scope>
</dependency>
</dependencies>