Skip to content

Commit

Permalink
Force players to be mountable inside replay
Browse files Browse the repository at this point in the history
  • Loading branch information
Moulberry committed Jan 23, 2025
1 parent a7bb88e commit 64df96f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ dependencies {

include(implementation("com.moulberry:mixinconstraints:1.0.1"))

modCompileOnly(rootProject.files('deps/DistantHorizons-2.3.0-b-RC2-1.21.4-neoforge-fabric.jar'))
modCompileOnly(rootProject.files('deps/DistantHorizons-2.3.0-b-RC3-1.21.4-neoforge-fabric.jar'))

modCompileOnly("maven.modrinth:sodium:RncWhTxD")
modCompileOnly("maven.modrinth:iris:kuOV4Ece")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
package com.moulberry.flashback.mixin.playback;

import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.moulberry.flashback.Flashback;
import com.moulberry.flashback.playback.ReplayServer;
import com.moulberry.flashback.state.EditorState;
import com.moulberry.flashback.state.EditorStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

import java.util.UUID;
Expand All @@ -34,6 +33,15 @@ public abstract class MixinEntity {
@Shadow
public abstract UUID getUUID();

// Force entities to be able to ride players on servers
@WrapOperation(method = "startRiding(Lnet/minecraft/world/entity/Entity;Z)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;isClientSide()Z"))
public boolean startRiding_isClientSide(Level instance, Operation<Boolean> original) {
if (Flashback.isInReplay()) {
return true; // Always pretend we're clientside so mounting players is allowed
}
return original.call(instance);
}

@Inject(method = "isInvisibleTo", at = @At("HEAD"), cancellable = true)
public void isInvisibleTo(Player player, CallbackInfoReturnable<Boolean> cir) {
ReplayServer replayServer = Flashback.getReplayServer();
Expand Down

0 comments on commit 64df96f

Please sign in to comment.