Skip to content

Feature: Server-side efficiency block mining calculations #5853

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature: Server-side efficiency block mining calculations #5853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5e8ced
Feature: Server-side efficiency block mining calculations
onebeastchris Sep 29, 2025
f35b590
Merge branch 'master' into geyser-side-efficiency
onebeastchris Sep 30, 2025
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
2 changes: 1 addition & 1 deletion core/src/main/java/org/geysermc/geyser/item/enchantment/Enchantment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static Enchantment read(RegistryEntryContext context) {

BedrockEnchantment bedrockEnchantment = BedrockEnchantment.getByJavaIdentifier(context.id().asString());

String description = bedrockEnchantment == null ? MessageTranslator.deserializeDescription(context.session(), data) : null;
String description = MessageTranslator.deserializeDescription(context.session(), data);

return new Enchantment(effects, supportedItems, maxLevel, description, anvilCost, exclusiveSet, bedrockEnchantment);
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/geysermc/geyser/item/type/Item.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public void translateNbtToJava(@NonNull GeyserSession session, @NonNull NbtMap b
}

BedrockEnchantment bedrockEnchantment = enchantment.bedrockEnchantment();
if (bedrockEnchantment == null) {
if (bedrockEnchantment == null || bedrockEnchantment == BedrockEnchantment.EFFICIENCY) {
String enchantmentTranslation = MinecraftLocale.getLocaleString(enchantment.description(), session.locale());
addJavaOnlyEnchantment(session, builder, enchantmentTranslation, level);
builder.addEnchantmentGlint();
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/geysermc/geyser/session/cache/BlockBreakHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ protected void handleBlockBreakActions(PlayerAuthInputPacket packet) {
// At this point it's safe to assume that we won't get subsequent block actions on this position
// so reset it and return since we've already broken the block
if (Objects.equals(lastMinedPosition, position)) {
lastMinedPosition = null;
this.lastMinedPosition = null;
continue;
}

Expand Down Expand Up @@ -515,7 +515,7 @@ protected boolean canDestroyBlock(BlockState state) {

protected boolean mayBreak(float progress, boolean bedrockDestroyed) {
// We're tolerant here to account for e.g. obsidian breaking speeds not matching 1:1 :(
return (serverSideBlockBreaking && progress >= 1.0F) || (bedrockDestroyed && progress >= 0.7F);
return (progress >= 1.0F) || (bedrockDestroyed && progress >= 0.7F);
}

protected void destroyBlock(BlockState state, Vector3i vector, Direction direction, boolean instamine) {
Expand Down