Skip to content
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

Jump to bottom

Update the interactive tag when necessary #2039

Merged
merged 4 commits into from
Mar 18, 2021
Merged

Update the interactive tag when necessary #2039

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22b95a2
Update the interactive tag when necessary
Camotoy Mar 14, 2021
5c639e6
Another immutable set
Camotoy Mar 14, 2021
5ef1d02
Import cleanup
Camotoy Mar 14, 2021
fb46145
Switch to EnumSets where possible and fix edge cases
Camotoy Mar 18, 2021
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
11 changes: 11 additions & 0 deletions connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,12 @@ public class GeyserSession implements CommandSender {
@Setter
private Entity ridingVehicleEntity;

/**
* The entity that the client is currently looking at.
*/
@Setter
private Entity mouseoverEntity;

@Setter
private Int2ObjectMap<Recipe> craftingRecipes;
private final Set<String> unlockedRecipes;
Expand Down Expand Up @@ -791,6 +797,11 @@ public void setSneaking(boolean sneaking) {
this.sneaking = sneaking;
collisionManager.updatePlayerBoundingBox();
collisionManager.updateScaffoldingFlags();

if (mouseoverEntity != null) {
// Horses, etc can change their property depending on if you're sneaking
InteractiveTagManager.updateTag(this, mouseoverEntity);
}
}

@Override
Expand Down
6 changes: 6 additions & 0 deletions ...ava/org/geysermc/connector/network/translators/bedrock/BedrockMobEquipmentTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.nukkitx.protocol.bedrock.data.inventory.ContainerId;
import com.nukkitx.protocol.bedrock.packet.MobEquipmentPacket;
import org.geysermc.connector.utils.CooldownUtils;
import org.geysermc.connector.utils.InteractiveTagManager;

@Translator(packet = MobEquipmentPacket.class)
public class BedrockMobEquipmentTranslator extends PacketTranslator<MobEquipmentPacket> {
Expand All @@ -55,5 +56,10 @@ public void translate(MobEquipmentPacket packet, GeyserSession session) {

// Java sends a cooldown indicator whenever you switch an item
CooldownUtils.sendCooldown(session);

// Update the interactive tag, if an entity is present
if (session.getMouseoverEntity() != null) {
InteractiveTagManager.updateTag(session, session.getMouseoverEntity());
}
}
}
Loading