Skip to content

Commit 1262413

Browse files
committed
Fabric; Fixed crash on server side
1 parent b5db8fb commit 1262413

File tree

5 files changed

+4
-71
lines changed

5 files changed

+4
-71
lines changed

fabric/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
org.gradle.jvmargs=-Xmx2G
33

44
# Mod Properties
5-
mod_version=1.6.2
5+
mod_version=1.6.2a
66
maven_group=cc.tweaked_programs
77
archives_base_name=cccbridge
88

fabric/src/main/java/cc/tweaked_programs/cccbridge/common/mixin/MixinAdventureUtil.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

fabric/src/main/java/cc/tweaked_programs/cccbridge/common/mixin/MixinCarriageContraption.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

fabric/src/main/java/cc/tweaked_programs/cccbridge/common/mixin/scroller/MixinScrollValueRenderer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
55
import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueRenderer;
66
import com.simibubi.create.foundation.utility.AdventureUtil;
7-
import net.minecraft.client.Minecraft;
87
import net.minecraft.client.multiplayer.ClientLevel;
98
import net.minecraft.core.BlockPos;
109
import net.minecraft.core.Direction;
@@ -22,8 +21,8 @@ private static boolean isPhysicalPlayer(Player player) {
2221
@Redirect(method = "addBox", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/foundation/utility/AdventureUtil;isAdventure(Lnet/minecraft/world/entity/player/Player;)Z"), remap = false)
2322
private static boolean cccbridge$addBox$redirectIsAdventure(Player player, ClientLevel world, BlockPos pos, Direction face, ScrollValueBehaviour behaviour, boolean highlight) {
2423
if (world.getBlockState(pos).getBlock() instanceof ScrollerBlock)
25-
return isPhysicalPlayer(Minecraft.getInstance().player);
24+
return isPhysicalPlayer(player);
2625

27-
return AdventureUtil.isAdventure(Minecraft.getInstance().player);
26+
return AdventureUtil.isAdventure(player);
2827
}
2928
}

fabric/src/main/java/cc/tweaked_programs/cccbridge/common/mixin/scroller/MixinValueSettingsInputHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import cc.tweaked_programs.cccbridge.common.minecraft.blockEntity.ScrollerBlockEntity;
44
import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsInputHandler;
55
import com.simibubi.create.foundation.utility.AdventureUtil;
6-
import net.minecraft.client.Minecraft;
76
import net.minecraft.world.entity.player.Player;
87
import net.minecraft.world.level.Level;
98
import net.minecraft.world.level.block.entity.BlockEntity;
@@ -28,7 +27,7 @@ private static boolean isPhysicalPlayer(Player player) {
2827
BlockEntity blockEntity = level.getBlockEntity(blockHit.getBlockPos());
2928

3029
if (blockEntity instanceof ScrollerBlockEntity)
31-
return !isPhysicalPlayer(Minecraft.getInstance().player);
30+
return !isPhysicalPlayer(player);
3231
}
3332

3433
return !AdventureUtil.isAdventure(player);

0 commit comments

Comments
 (0)