Skip to content

Commit 7f61537

Browse files
committed
Compile against 1.21.1
1 parent d636be8 commit 7f61537

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ repositories {
3434

3535
dependencies {
3636
implementation 'net.bytebuddy:byte-buddy:1.14.14'
37-
compileOnly 'org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT'
38-
compileOnly 'org.spigotmc:spigot:1.21-R0.1-SNAPSHOT'
37+
compileOnly 'org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT'
38+
compileOnly 'org.spigotmc:spigot:1.21.1-R0.1-SNAPSHOT'
3939
compileOnly 'io.netty:netty-all:4.0.23.Final'
4040
compileOnly 'net.kyori:adventure-text-serializer-gson:4.14.0'
4141
compileOnly 'com.googlecode.json-simple:json-simple:1.1.1'
@@ -46,7 +46,7 @@ dependencies {
4646
testImplementation 'org.mockito:mockito-core:5.6.0'
4747
testImplementation 'io.netty:netty-common:4.1.97.Final'
4848
testImplementation 'io.netty:netty-transport:4.1.97.Final'
49-
testImplementation 'org.spigotmc:spigot:1.21-R0.1-SNAPSHOT'
49+
testImplementation 'org.spigotmc:spigot:1.21.1-R0.1-SNAPSHOT'
5050
testImplementation 'net.kyori:adventure-text-serializer-gson:4.14.0'
5151
testImplementation 'net.kyori:adventure-text-serializer-plain:4.14.0'
5252
}

src/test/java/com/comphenix/protocol/BukkitInitialization.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ private void initialize() {
167167
when(mockedServer.getRegistry(any())).thenAnswer(invocation -> {
168168
Class<Keyed> registryType = invocation.getArgument(0);
169169
Object registry = CraftRegistry.createRegistry(registryType, registryCustom);
170-
171-
// this is very temporary fix to the version mismatch between spigot-api (spigot-repo) and spigot (dmulloy2-repo)
172-
// if you remove this fix please also remove the DummyRegistry class down below
173-
if (registry == null)
174-
return new DummyRegistry<>();
175-
170+
171+
if (registry == null) {
172+
System.err.println("WARN: Missing registry for " + registryType);
173+
return new DummyRegistry<>();
174+
}
175+
176176
return registry;
177177
});
178178

0 commit comments

Comments
 (0)