Skip to content

Commit 30e5086

Browse files
authored
Merge pull request #3376 from Multiverse/fix/java-17-issue
Fix compatibility with Java 17
2 parents 5dde760 + e62e378 commit 30e5086

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/main/java/org/mvplugins/multiverse/core/PlaceholderExpansionHook.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public boolean persist() {
8080
return null;
8181
}
8282

83-
final var placeholder = paramsArray.removeFirst();
83+
final var placeholder = paramsArray.remove(0);
8484

8585
String worldName = parseWorldName(offlinePlayer, paramsArray);
8686
if (worldName == null) return null;
@@ -103,9 +103,9 @@ public boolean persist() {
103103
}
104104

105105
// Try get from params
106-
String paramWorldName = paramsArray.getLast();
106+
String paramWorldName = paramsArray.get(paramsArray.size() - 1);
107107
if (worldManager.isLoadedWorld(paramWorldName)) {
108-
paramsArray.removeLast();
108+
paramsArray.remove(paramsArray.size() - 1);
109109
return paramWorldName;
110110
}
111111

@@ -177,7 +177,7 @@ public boolean persist() {
177177
return String.valueOf(world.getSeed());
178178
}
179179
case "time" -> {
180-
String timeFormat = !placeholderParams.isEmpty() ? placeholderParams.getFirst() : "";
180+
String timeFormat = !placeholderParams.isEmpty() ? placeholderParams.get(0) : "";
181181
long time = world.getBukkitWorld().map(World::getTime).getOrElse(0L);
182182
switch (timeFormat) {
183183
case "" -> {

src/main/java/org/mvplugins/multiverse/core/commands/SpawnCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private void handleSingleTeleport(MVCommandIssuer issuer, LoadedMultiverseWorld
119119
? Message.of(MVCorei18n.GENERIC_YOU)
120120
: Message.of(entity.getName())),
121121
Replace.WORLD.with(mvWorld.getName()),
122-
Replace.REASON.with(failure.getFirst().getFailureMessage())));
122+
Replace.REASON.with(failure.get(0).getFailureMessage())));
123123
}
124124

125125
private void handleMultiTeleport(MVCommandIssuer issuer, LoadedMultiverseWorld mvWorld,

src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ private void teleportToDestinationOnJoin(Player player, DestinationInstance<?, ?
260260
.onSuccess(result -> Logging.fine("Player %s has been teleported on join",
261261
player.getName()))
262262
.onFailure(failure -> Logging.warning("Failed to teleport player %s on join: %s",
263-
player.getName(), failure.getFirst()));
263+
player.getName(), failure.get(0)));
264264
}
265265

266266
/**

0 commit comments

Comments
 (0)