Skip to content

Commit 19cc45d

Browse files
authored
Merge branch 'EngineHub:version/7.3.x' into version/7.3.x
2 parents f80a5ef + 805bde1 commit 19cc45d

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ fabric-api = "0.110.5+1.21.4"
1515
neogradle = "7.0.171"
1616
neoforge-minecraft = "1.21.4"
1717

18-
sponge-minecraft = "1.21.3"
18+
sponge-minecraft = "1.21.4"
1919
# https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/spongeapi/
20-
sponge-api = "13.0.0-20241025.155029-3"
21-
sponge-api-major = "13"
20+
sponge-api = "14.0.0-20241229.134205-2"
21+
sponge-api-major = "14"
2222

2323
# https://parchmentmc.org/docs/getting-started; note that we use older MC versions some times which is OK
2424
parchment-minecraft = "1.21"

worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
import org.spongepowered.plugin.PluginContainer;
7171
import org.spongepowered.plugin.builtin.jvm.Plugin;
7272

73+
import java.lang.invoke.MethodHandles;
7374
import java.nio.file.Files;
7475
import java.nio.file.Path;
7576
import java.util.Collections;
@@ -132,7 +133,8 @@ public void onPluginConstruction(ConstructPluginEvent event) {
132133

133134
event.game().eventManager().registerListeners(
134135
container,
135-
new CUIChannelHandler.RegistrationHandler()
136+
new CUIChannelHandler.RegistrationHandler(),
137+
MethodHandles.lookup()
136138
);
137139

138140
event.game().eventManager().registerListeners(
@@ -319,8 +321,8 @@ SpongeConfiguration getConfig() {
319321

320322
public Actor wrapCommandCause(CommandCause cause) {
321323
Object rootCause = cause.root();
322-
if (rootCause instanceof ServerPlayer) {
323-
return SpongeAdapter.adapt((ServerPlayer) rootCause);
324+
if (rootCause instanceof ServerPlayer serverPlayer) {
325+
return SpongeAdapter.adapt(serverPlayer);
324326
}
325327
if (rootCause instanceof LocatableBlock locatableBlock) {
326328
Optional<? extends BlockEntity> optionalBlockEntity = locatableBlock.world().blockEntity(locatableBlock.blockPosition());
@@ -331,8 +333,8 @@ public Actor wrapCommandCause(CommandCause cause) {
331333
}
332334
}
333335
}
334-
if (rootCause instanceof Audience) {
335-
return new SpongeCommandSender((Audience) rootCause);
336+
if (rootCause instanceof Audience audience) {
337+
return new SpongeCommandSender(audience);
336338
}
337339

338340
throw new UnsupportedOperationException("Cannot wrap " + rootCause.getClass());

0 commit comments

Comments
 (0)