Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-02-12 11:03:42 -04:00
commit 397d1e5449
2 files changed
+2 -2

No files matched your search

@@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.ModifyConstant;
@Mixin(value = PistonHandler.class, priority = 69420) // piston push limit is important for carpet @Mixin(value = PistonHandler.class, priority = 420) // piston push limit is important for carpet
public class PistonHandler_pushLimitMixin public class PistonHandler_pushLimitMixin
{ {
@ModifyConstant(method = "tryMove", constant = @Constant(intValue = 12), expect = 3) @ModifyConstant(method = "tryMove", constant = @Constant(intValue = 12), expect = 3)
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.ModifyConstant;
@Mixin(ServerPlayerInteractionManager.class) @Mixin(value = ServerPlayerInteractionManager.class, priority = 69420) // not that important for carpet
public class ServerPlayerInteractionManager_antiCheatMixin public class ServerPlayerInteractionManager_antiCheatMixin
{ {
@Shadow public ServerPlayerEntity player; @Shadow public ServerPlayerEntity player;