Skip to content

Commit c969518

Browse files
committed
Fix build with library updates
1 parent b302414 commit c969518

8 files changed

Lines changed: 14 additions & 10 deletions

File tree

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Newbie.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void execute(final CommandSender sender, final String label, final List<C
103103
return;
104104
}
105105

106-
final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayerOrNull();
106+
final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayer();
107107
final CombatPlayer target = ph.get(targetPlayer);
108108
final long timeLeft = target.getNewbieTimeLeft();
109109
sender.sendMessage(Lang.NEWBIE_TIME_CHECK_OTHER.msg(target.getName(), TimeUtil.getDiffDuration(Lang.NEWBIE_TIME_CHECK_OTHER, timeLeft)));
@@ -124,7 +124,7 @@ public AddNewbieCommand(final PlayerManager ph) {
124124

125125
@Override
126126
public void execute(final CommandSender sender, final String label, final List<CommandArgument> args) {
127-
final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayerOrNull();
127+
final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayer();
128128
final CombatPlayer target = ph.get(targetPlayer);
129129
target.setNewbie(true);
130130
sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " Added newbie protection to &#FFFF55" + target.getName()));
@@ -145,7 +145,7 @@ public RemoveNewbieCommand(final PlayerManager ph) {
145145

146146
@Override
147147
public void execute(final CommandSender sender, final String label, final List<CommandArgument> args) {
148-
final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayerOrNull();
148+
final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayer();
149149
final CombatPlayer target = ph.get(targetPlayer);
150150
target.setNewbie(false);
151151
sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " Removed newbie protection from &#FFFF55" + target.getName()));

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PM.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import me.chancesd.pvpmanager.setting.Permissions;
2727
import me.chancesd.pvpmanager.setting.Conf;
2828
import me.chancesd.pvpmanager.storage.fields.UserDataFields;
29-
import me.chancesd.sdutils.scheduler.ScheduleUtils;
3029
import me.chancesd.sdutils.command.ArgumentType;
3130
import me.chancesd.sdutils.command.BaseCommand;
3231
import me.chancesd.sdutils.command.CommandArgument;
@@ -229,7 +228,7 @@ public void execute(final CommandSender sender, final String label, final List<C
229228
final CommandArgument argument = getArgument(args, "player");
230229
CombatPlayer targetPlayer = null;
231230
if (argument != null) {
232-
targetPlayer = plugin.getPlayerManager().get(argument.getAsPlayerOrNull());
231+
targetPlayer = plugin.getPlayerManager().get(argument.getAsPlayer());
233232
} else if (sender instanceof final Player commandSender) {
234233
targetPlayer = plugin.getPlayerManager().get(commandSender);
235234
}

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void execute(final CommandSender sender, final String label, final List<C
3636
sendInfo(sender, ph.get(player));
3737
} else if (hasArgument(args, ARG_PLAYER)) {
3838
final CommandArgument targetArg = getArgument(args, ARG_PLAYER);
39-
final Player targetPlayer = targetArg.getAsPlayerOrNull();
39+
final Player targetPlayer = targetArg.getAsPlayer();
4040
sendInfo(sender, ph.get(targetPlayer));
4141
} else {
4242
ChatUtils.send(sender, "&#FF5555This command requires a target player when used from console.");

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void execute(final CommandSender sender, final String label, final List<C
4444
return;
4545
}
4646
final CommandArgument targetArg = getArgument(args, "target");
47-
final Player targetPlayer = targetArg.getAsPlayerOrNull();
47+
final Player targetPlayer = targetArg.getAsPlayer();
4848
final CombatPlayer target = playerManager.get(targetPlayer);
4949
if (!target.hasPvPEnabled()) {
5050
sender.sendMessage(Lang.OTHERS_STATUS_DISABLED.msg(targetPlayer.getName()));

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Tag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void execute(final CommandSender sender, final String label, final List<C
5353
if (targetArg.isWildcard()) {
5454
tagAll(sender, timeInMs);
5555
} else {
56-
final Player targetPlayer = targetArg.getAsPlayerOrNull();
56+
final Player targetPlayer = targetArg.getAsPlayerOrWildcard();
5757
tagPlayer(sender, targetPlayer.getName(), timeInMs);
5858
}
5959
}

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Untag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void execute(final CommandSender sender, final String label, final List<C
3535
untagAll(sender);
3636
return;
3737
}
38-
final Player targetPlayer = targetArg.getAsPlayerOrNull();
38+
final Player targetPlayer = targetArg.getAsPlayerOrWildcard();
3939
final CombatPlayer combatPlayer = playerManager.get(targetPlayer);
4040
if (!combatPlayer.isInCombat()) {
4141
sender.sendMessage(Lang.PREFIX + " §cThat player is not in combat");

pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/SQLStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private Database setupDatabase(final DatabaseConfigBuilder config) {
5858
"uuid CHAR(36) NOT NULL, name VARCHAR(255) NOT NULL PRIMARY KEY, pvp BOOLEAN DEFAULT 1, forcepvp VARCHAR(16) DEFAULT 'NONE'");
5959
db.registerTable(worldsTable);
6060
Log.infoColor(ChatColor.GREEN + "Connected to " + ChatColor.AQUA + config.getType() + ChatColor.GREEN + " database successfully");
61-
Log.infoColor(ChatColor.GREEN + "Players stored: " + ChatColor.GOLD + db.getRowCount(usersTable));
61+
Log.infoColor(ChatColor.GREEN + "Players stored: " + ChatColor.GOLD + db.executeCountQuery(usersTable, ""));
6262
return db;
6363
}
6464

pvpmanager/src/main/java/me/chancesd/pvpmanager/storage/converter/DisplayNameConverter.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ public Table getNewTable() {
3535
return null;
3636
}
3737

38+
@Override
39+
public int getMinimumDatabaseVersion() {
40+
return 1;
41+
}
42+
3843
@Override
3944
public void convertAll(final Database database, final ResultSet results) throws SQLException {
4045
Log.infoColor(ChatColor.GOLD + ">> Starting database conversion to allow saving bigger display names");

0 commit comments

Comments
 (0)