AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-01 05:57:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some dumb shit

Browse Source
This commit is contained in:
Paul Reilly 2023-04-07 16:22:43 -05:00
parent 71fe940049
commit 6566c7f305
3 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
View File

@ -1,13 +1,11 @@
package me.totalfreedom.totalfreedommod.command; package me.totalfreedom.totalfreedommod.command;
import com.earth2me.essentials.commands.PlayerNotFoundException;
import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.GroupProvider; import me.totalfreedom.totalfreedommod.rank.GroupProvider;
import me.totalfreedom.totalfreedommod.rank.Hierarchy; import me.totalfreedom.totalfreedommod.rank.Hierarchy;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -148,12 +146,10 @@ public class Command_mbconfig extends FreedomCommand
return noPerms(); return noPerms();
} }
try Player player = getPlayer(args[1]);
{
OfflinePlayer player = getOfflinePlayer(args[1]);
PlayerData data = plugin.pl.getData(args[1]); PlayerData data = plugin.pl.getData(args[1]);
if (data == null || !data.isMasterBuilder()) if (player == null || data == null || !data.isMasterBuilder())
{ {
msgNew("Master Builder not found: <arg>", arg(args[1])); msgNew("Master Builder not found: <arg>", arg(args[1]));
return true; return true;
@ -163,19 +159,9 @@ public class Command_mbconfig extends FreedomCommand
Hierarchy.getHierarchy().dropUserFromAll(Hierarchy.getHierarchy().builder(), player); Hierarchy.getHierarchy().dropUserFromAll(Hierarchy.getHierarchy().builder(), player);
data.setMasterBuilder(false); data.setMasterBuilder(false);
plugin.pl.save(data); plugin.pl.save(data);
plugin.rm.updateDisplay(player);
if (player.isOnline())
{
// This is not null because the player is online, so we can safely call this method.
plugin.rm.updateDisplay(player.getPlayer());
}
return true; return true;
} catch (PlayerNotFoundException e)
{
msgNew("Player not found: <arg>", arg(args[1]));
return true;
}
} }
default: default:
{ {

17
commons/src/main/java/me/totalfreedom/totalfreedommod/perms/UserWrapper.java
View File

@ -7,7 +7,6 @@ import net.luckperms.api.model.user.User;
import net.luckperms.api.model.user.UserManager; import net.luckperms.api.model.user.UserManager;
import net.luckperms.api.platform.PlayerAdapter; import net.luckperms.api.platform.PlayerAdapter;
import net.luckperms.api.query.QueryOptions; import net.luckperms.api.query.QueryOptions;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.HashSet; import java.util.HashSet;
@ -17,11 +16,11 @@ import java.util.concurrent.CompletableFuture;
public class UserWrapper public class UserWrapper
{ {
private final UserManager manager; private final UserManager manager;
private final PlayerAdapter<OfflinePlayer> playerAdapter; private final PlayerAdapter<Player> playerAdapter;
private final Set<User> userSet; private final Set<User> userSet;
private final Set<UserData> userDataSet; private final Set<UserData> userDataSet;
public UserWrapper(UserManager manager, PlayerAdapter<OfflinePlayer> adapter) public UserWrapper(UserManager manager, PlayerAdapter<Player> adapter)
{ {
this.manager = manager; this.manager = manager;
this.userSet = manager.getLoadedUsers(); this.userSet = manager.getLoadedUsers();
@ -29,7 +28,7 @@ public class UserWrapper
this.userDataSet = new HashSet<>(); this.userDataSet = new HashSet<>();
} }
public CompletableFuture<Void> addUserData(OfflinePlayer player) public CompletableFuture<Void> addUserData(Player player)
{ {
User user = playerAdapter.getUser(player); User user = playerAdapter.getUser(player);
CachedPermissionData permissionData = playerAdapter.getPermissionData(player); CachedPermissionData permissionData = playerAdapter.getPermissionData(player);
@ -41,7 +40,7 @@ public class UserWrapper
return CompletableFuture.runAsync(() -> userDataSet.add(userData)); return CompletableFuture.runAsync(() -> userDataSet.add(userData));
} }
public CompletableFuture<User> getUser(OfflinePlayer player) public CompletableFuture<User> getUser(Player player)
{ {
if (!manager.isLoaded(player.getUniqueId()) || !userSet.contains(manager.getUser(player.getUniqueId()))) if (!manager.isLoaded(player.getUniqueId()) || !userSet.contains(manager.getUser(player.getUniqueId())))
{ {
@ -51,7 +50,7 @@ public class UserWrapper
return CompletableFuture.supplyAsync(() -> manager.getUser(player.getUniqueId())); return CompletableFuture.supplyAsync(() -> manager.getUser(player.getUniqueId()));
} }
public CompletableFuture<Void> removeUser(OfflinePlayer player) public CompletableFuture<Void> removeUser(Player player)
{ {
return getUser(player).thenAccept(a -> return getUser(player).thenAccept(a ->
{ {
@ -60,7 +59,7 @@ public class UserWrapper
}); });
} }
public CompletableFuture<UserData> getUserData(OfflinePlayer player) public CompletableFuture<UserData> getUserData(Player player)
{ {
return getUser(player).thenApply(user -> return getUser(player).thenApply(user ->
{ {
@ -75,12 +74,12 @@ public class UserWrapper
}); });
} }
public CompletableFuture<Void> removeUserData(OfflinePlayer player) public CompletableFuture<Void> removeUserData(Player player)
{ {
return getUserData(player).thenAccept(userDataSet::remove); return getUserData(player).thenAccept(userDataSet::remove);
} }
public CompletableFuture<Void> updateUserData(OfflinePlayer player) public CompletableFuture<Void> updateUserData(Player player)
{ {
return getUserData(player).thenApply(userData -> return getUserData(player).thenApply(userData ->
{ {

17
commons/src/main/java/me/totalfreedom/totalfreedommod/rank/Hierarchy.java
View File

@ -12,7 +12,7 @@ import net.luckperms.api.node.types.InheritanceNode;
import net.luckperms.api.track.DemotionResult; import net.luckperms.api.track.DemotionResult;
import net.luckperms.api.track.PromotionResult; import net.luckperms.api.track.PromotionResult;
import net.luckperms.api.track.Track; import net.luckperms.api.track.Track;
import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@ -29,7 +29,7 @@ public class Hierarchy
this.groupWrapper = new GroupWrapper(TotalFreedomMod.getPlugin().lpb.getAPI().getGroupManager()); this.groupWrapper = new GroupWrapper(TotalFreedomMod.getPlugin().lpb.getAPI().getGroupManager());
this.trackWrapper = new TrackWrapper(TotalFreedomMod.getPlugin().lpb.getAPI().getTrackManager()); this.trackWrapper = new TrackWrapper(TotalFreedomMod.getPlugin().lpb.getAPI().getTrackManager());
this.userWrapper = new UserWrapper(TotalFreedomMod.getPlugin().lpb.getAPI().getUserManager(), this.userWrapper = new UserWrapper(TotalFreedomMod.getPlugin().lpb.getAPI().getUserManager(),
TotalFreedomMod.getPlugin().lpb.getAPI().getPlayerAdapter(OfflinePlayer.class)); TotalFreedomMod.getPlugin().lpb.getAPI().getPlayerAdapter(Player.class));
} }
public static Hierarchy getHierarchy() public static Hierarchy getHierarchy()
@ -37,7 +37,7 @@ public class Hierarchy
return hierarchy; return hierarchy;
} }
public boolean isUserOnAdminTrack(OfflinePlayer player) public boolean isUserOnAdminTrack(Player player)
{ {
AtomicBoolean isOnAdminTrack = new AtomicBoolean(false); AtomicBoolean isOnAdminTrack = new AtomicBoolean(false);
userWrapper.getUser(player).thenAccept(user -> userWrapper.getUser(player).thenAccept(user ->
@ -95,7 +95,8 @@ public class Hierarchy
}); });
} }
public Group getGroup(String name) { public Group getGroup(String name)
{
return groupWrapper.getGroup(name).join(); return groupWrapper.getGroup(name).join();
} }
@ -114,19 +115,19 @@ public class Hierarchy
}); });
} }
public CompletableFuture<PromotionResult> promoteUser(Track track, OfflinePlayer player) public CompletableFuture<PromotionResult> promoteUser(Track track, Player player)
{ {
return userWrapper.getUserData(player).thenApply(data -> return userWrapper.getUserData(player).thenApply(data ->
track.promote(data.getUser(), data.getContextSet())); track.promote(data.getUser(), data.getContextSet()));
} }
public CompletableFuture<DemotionResult> demoteUser(Track track, OfflinePlayer player) public CompletableFuture<DemotionResult> demoteUser(Track track, Player player)
{ {
return userWrapper.getUserData(player).thenApply(data -> return userWrapper.getUserData(player).thenApply(data ->
track.demote(data.getUser(), data.getContextSet())); track.demote(data.getUser(), data.getContextSet()));
} }
public void addUserToGroup(DisplayableGroup group, OfflinePlayer player) public void addUserToGroup(DisplayableGroup group, Player player)
{ {
userWrapper.getUserData(player).thenAccept(user -> userWrapper.getUserData(player).thenAccept(user ->
{ {
@ -147,7 +148,7 @@ public class Hierarchy
}); });
} }
public void dropUserFromAll(Track track, OfflinePlayer player) public void dropUserFromAll(Track track, Player player)
{ {
userWrapper.getUserData(player).thenAccept(data -> userWrapper.getUserData(player).thenAccept(data ->
{ {