mirror of https://github.com/GeyserMC/Geyser.git
Fix merge mistake
This commit is contained in:
parent
c98d090774
commit
d1af3ff7d6
|
@ -194,7 +194,6 @@ public class GeyserSpigotWorldManager extends WorldManager {
|
||||||
return GameMode.byId(Bukkit.getDefaultGameMode().ordinal());
|
return GameMode.byId(Bukkit.getDefaultGameMode().ordinal());
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull CompletableFuture<@Nullable DataComponents> getPickItemComponents(GeyserSession session, int x, int y, int z, boolean addNbtData) {
|
public @NonNull CompletableFuture<@Nullable DataComponents> getPickItemComponents(GeyserSession session, int x, int y, int z, boolean addNbtData) {
|
||||||
CompletableFuture<@Nullable DataComponents> future = new CompletableFuture<>();
|
CompletableFuture<@Nullable DataComponents> future = new CompletableFuture<>();
|
||||||
|
|
Loading…
Reference in New Issue