Skip to content

1.21.2+ fix #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tildejustin merged 1 commit into from
Dec 3, 2024
Merged

1.21.2+ fix #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 1.19-1.21/build.gradle → 1.19-1.21.4/build.gradle
View file
Open in desktop
File renamed without changes.
0 1.19-1.21/gradle.properties → 1.19-1.21.4/gradle.properties
View file
Open in desktop
File renamed without changes.
0 ...spawn/mod/mixin/MinecraftServerMixin.java → ...spawn/mod/mixin/MinecraftServerMixin.java
View file
Open in desktop
File renamed without changes.
9 changes: 8 additions & 1 deletion ...wn/mod/mixin/ServerPlayerEntityMixin.java → ...wn/mod/mixin/ServerPlayerEntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,14 @@ private void failOnNonRandomSpawns(CallbackInfo ci, @Share("seed") LocalRef<Seed

@Group
@Dynamic
@Inject(method = "method_14245(Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;", at = @At(value = "INVOKE", target = "Lnet/minecraft/class_3218;method_8587(Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z", ordinal = 1), require = 0)
@Inject(
method = "method_14245(Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;",
at = {
@At(value = "INVOKE", target = "Lnet/minecraft/class_3218;method_8587(Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z", ordinal = 1),
@At(value = "INVOKE", target = "Lnet/minecraft/class_3222;method_61274(Lnet/minecraft/class_3218;Lnet/minecraft/class_238;)Z", ordinal = 1)
},
require = 0, allow = 1
)
private void failOnNonRandomSpawns2(CallbackInfoReturnable<Boolean> cir, @Share("seed") LocalRef<Seed> seed, @Share("isRandomSpawn") LocalBooleanRef isRandomSpawn) {
if (!isRandomSpawn.get() && seed.get() != null) {
this.setSpawnError = "Failed to apply SetSpawn configuration because the spawn was not random. Not overriding player spawnpoint.";
Expand Down
0 ...ain/resources/assets/setspawnmod/icon.png → ...ain/resources/assets/setspawnmod/icon.png
View file
Open in desktop
File renamed without changes
0 1.19-1.21/src/main/resources/fabric.mod.json → ...1.21.4/src/main/resources/fabric.mod.json
View file
Open in desktop
File renamed without changes.
0 ...rc/main/resources/setspawnmod.mixins.json → ...rc/main/resources/setspawnmod.mixins.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ include "1.12"
include "1.8-1.12.2"
include "1.13.x"
include "1.14-1.18.2"
include "1.19-1.21"
include "1.19-1.21.4"
Loading