mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
754bb42c19
* Prevent boats from floating when a Bedrock player rides in the back * Update llama and shulker mount height offset * Fix Trader llama mount offset * Change passengers to an IntList Also move rotation lock stuff to EntityUtils * Allow EntityCache.getEntityByJavaId to return the session's player Removes many checks from several translators. * Fix mount offset on armorstands and area effect clouds Also prevent area effect clouds from despawning when used as an invisible entity (used in GSit to offset players riding on other players) * Update mount offsets on height changes TODO test this * Actually update vehicleId and optimize StriderEntity metadata update * Don't hide marker armor stands and properly update mount offsets * What? * Remove y offset for Shulkers riding other entities * Confirm teleports in the order received This allows Bedrock players to move after standing up when using GSit * Fix mount offset for riders on baby zoglins * Cache only the latest teleport and confirm teleports immediately * Fix crawling with GSit * Inline var and undo respawn method * Use Entity reference for vehicles * Remove ridingVehicleEntity from GeyserSession * Use Entity references for passengers and drop cachedPlayerEntityLinks * Reuse variable and remove setVehicle(null)
121 lines
6.3 KiB
Java
121 lines
6.3 KiB
Java
/*
|
|
* Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*
|
|
* @author GeyserMC
|
|
* @link https://github.com/GeyserMC/Geyser
|
|
*/
|
|
|
|
package org.geysermc.geyser.translator.protocol.bedrock.entity.player;
|
|
|
|
import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
|
|
import com.github.steveice10.mc.protocol.data.game.entity.player.InteractAction;
|
|
import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerState;
|
|
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundInteractPacket;
|
|
import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerCommandPacket;
|
|
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
|
|
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
|
|
import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
|
|
import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
|
|
import com.nukkitx.protocol.bedrock.packet.InteractPacket;
|
|
import org.geysermc.geyser.entity.type.Entity;
|
|
import org.geysermc.geyser.entity.type.living.animal.horse.AbstractHorseEntity;
|
|
import org.geysermc.geyser.session.GeyserSession;
|
|
import org.geysermc.geyser.translator.protocol.PacketTranslator;
|
|
import org.geysermc.geyser.translator.protocol.Translator;
|
|
import org.geysermc.geyser.entity.InteractiveTagManager;
|
|
|
|
@Translator(packet = InteractPacket.class)
|
|
public class BedrockInteractTranslator extends PacketTranslator<InteractPacket> {
|
|
|
|
@Override
|
|
public void translate(GeyserSession session, InteractPacket packet) {
|
|
Entity entity;
|
|
if (packet.getRuntimeEntityId() == session.getPlayerEntity().getGeyserId()) {
|
|
//Player is not in entity cache
|
|
entity = session.getPlayerEntity();
|
|
} else {
|
|
entity = session.getEntityCache().getEntityByGeyserId(packet.getRuntimeEntityId());
|
|
}
|
|
if (entity == null)
|
|
return;
|
|
|
|
switch (packet.getAction()) {
|
|
case INTERACT:
|
|
if (session.getPlayerInventory().getItemInHand().getJavaId() == session.getItemMappings().getStoredItems().shield().getJavaId()) {
|
|
break;
|
|
}
|
|
ServerboundInteractPacket interactPacket = new ServerboundInteractPacket((int) entity.getEntityId(),
|
|
InteractAction.INTERACT, Hand.MAIN_HAND, session.isSneaking());
|
|
session.sendDownstreamPacket(interactPacket);
|
|
break;
|
|
case DAMAGE:
|
|
ServerboundInteractPacket attackPacket = new ServerboundInteractPacket((int) entity.getEntityId(),
|
|
InteractAction.ATTACK, Hand.MAIN_HAND, session.isSneaking());
|
|
session.sendDownstreamPacket(attackPacket);
|
|
break;
|
|
case LEAVE_VEHICLE:
|
|
ServerboundPlayerCommandPacket sneakPacket = new ServerboundPlayerCommandPacket((int) entity.getEntityId(), PlayerState.START_SNEAKING);
|
|
session.sendDownstreamPacket(sneakPacket);
|
|
break;
|
|
case MOUSEOVER:
|
|
// Handle the buttons for mobile - "Mount", etc; and the suggestions for console - "ZL: Mount", etc
|
|
if (packet.getRuntimeEntityId() != 0) {
|
|
Entity interactEntity = session.getEntityCache().getEntityByGeyserId(packet.getRuntimeEntityId());
|
|
session.setMouseoverEntity(interactEntity);
|
|
if (interactEntity == null) {
|
|
return;
|
|
}
|
|
|
|
InteractiveTagManager.updateTag(session, interactEntity);
|
|
} else {
|
|
if (session.getMouseoverEntity() != null) {
|
|
// No interactive tag should be sent
|
|
session.setMouseoverEntity(null);
|
|
session.getPlayerEntity().getDirtyMetadata().put(EntityData.INTERACTIVE_TAG, "");
|
|
session.getPlayerEntity().updateBedrockMetadata();
|
|
}
|
|
}
|
|
break;
|
|
case OPEN_INVENTORY:
|
|
if (session.getOpenInventory() == null) {
|
|
Entity ridingEntity = session.getPlayerEntity().getVehicle();
|
|
if (ridingEntity instanceof AbstractHorseEntity) {
|
|
if (ridingEntity.getFlag(EntityFlag.TAMED)) {
|
|
// We should request to open the horse inventory instead
|
|
ServerboundPlayerCommandPacket openHorseWindowPacket = new ServerboundPlayerCommandPacket((int) session.getPlayerEntity().getEntityId(), PlayerState.OPEN_HORSE_INVENTORY);
|
|
session.sendDownstreamPacket(openHorseWindowPacket);
|
|
}
|
|
} else {
|
|
session.setOpenInventory(session.getPlayerInventory());
|
|
|
|
ContainerOpenPacket containerOpenPacket = new ContainerOpenPacket();
|
|
containerOpenPacket.setId((byte) 0);
|
|
containerOpenPacket.setType(ContainerType.INVENTORY);
|
|
containerOpenPacket.setUniqueEntityId(-1);
|
|
containerOpenPacket.setBlockPosition(entity.getPosition().toInt());
|
|
session.sendUpstreamPacket(containerOpenPacket);
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|