Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Feature/block harvest#174

Merged
TheGlitch76 merged 16 commits intomasterfrom
feature/block-harvest
Aug 16, 2020
Merged

Feature/block harvest#174
TheGlitch76 merged 16 commits intomasterfrom
feature/block-harvest

Conversation

@rikka0w0
Copy link
Contributor

@rikka0w0 rikka0w0 commented Aug 9, 2020

Remove the malfunction 1.15 patch,

Move the BlockEvent from events-world to extensions-block, this can remove an unnecessary dependency, to make porting easier.

@rikka0w0 rikka0w0 requested a review from TheGlitch76 August 13, 2020 12:25
Copy link
Member

@TheGlitch76 TheGlitch76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found an issue i missed the first time and then this LGTM


import net.patchworkmc.impl.extensions.block.Signatures;

// This is a 1.15+ patch, should not be used in 1.14.4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go ahead and just remove this.

// Suppress this call
}

@Redirect(method = "tryBreakBlock", at = @At(value = "INVOKE", target = Signatures.ServerPlayerInteractionManager_isCreative, ordinal = 0))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this needs to be a redirect. One option could be to @slice from the isCreative check and inject at RETURN ordinal = 0.

Conflicts:
	patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java
Conflicts:
	patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java
@TheGlitch76 TheGlitch76 merged commit 146f43b into master Aug 16, 2020
@TheGlitch76 TheGlitch76 deleted the feature/block-harvest branch August 16, 2020 19:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants