Skip to content

Carpet compatibility #151

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

Open
HaHaWTH wants to merge 1 commit into
base: mc/1.21.10
Choose a base branch
from
Open

Carpet compatibility #151

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
14 changes: 9 additions & 5 deletions src/main/java/ca/spottedleaf/moonrise/mixin/collisions/ServerExplosionMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@
import net.minecraft.world.phys.shapes.VoxelShape;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -348,8 +346,14 @@ private void initCacheFields(final CallbackInfoReturnable<Integer> cir) {
* @reason Rewrite ray casting for performance
* @author Spottedleaf
*/
@Overwrite
public List<BlockPos> calculateExplodedPositions() {
@Inject(
method = "calculateExplodedPositions",
at = @At(
value = "HEAD"
),
cancellable = true
)
public void calculateExplodedPositions(CallbackInfoReturnable<List<BlockPos>> cir) {
final ObjectArrayList<BlockPos> ret = new ObjectArrayList<>();

final Vec3 center = this.center;
Expand Down Expand Up @@ -432,7 +436,7 @@ public List<BlockPos> calculateExplodedPositions() {
} while (power > 0.0f);
}

return ret;
cir.setReturnValue(ret);
}

/**
Expand Down