GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Improvements to VillagerEntity (#2412)

Browse source 
* initial changes to villager

* touchup

* don't call getPos() twice

* whoops, better
This commit is contained in:
Konicai 2021-07-30 16:45:50 -04:00 committed by GitHub
parent 8c95e26189
commit 6f93bbfe21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
connector/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java
View file

@ -97,58 +97,50 @@ public class VillagerEntity extends AbstractMerchantEntity {
} }
super.updateBedrockMetadata(entityMetadata, session); super.updateBedrockMetadata(entityMetadata, session);
} }
@Override @Override
public void moveRelative(GeyserSession session, double relX, double relY, double relZ, Vector3f rotation, boolean isOnGround) { public void moveRelative(GeyserSession session, double relX, double relY, double relZ, Vector3f rotation, boolean isOnGround) {
if (!metadata.getFlags().getFlag(EntityFlag.SLEEPING)) { // The bed block position, if it exists
Vector3i bedPosition;
if (!metadata.getFlags().getFlag(EntityFlag.SLEEPING) || (bedPosition = metadata.getPos(EntityData.BED_POSITION, null)) == null) {
// No need to worry about extra processing to compensate for sleeping // No need to worry about extra processing to compensate for sleeping
super.moveRelative(session, relX, relY, relZ, rotation, isOnGround); super.moveRelative(session, relX, relY, relZ, rotation, isOnGround);
return; return;
} }
// The bed block
int blockId = session.getConnector().getWorldManager().getBlockAt(session, bedPosition);
String fullIdentifier = BlockRegistries.JAVA_IDENTIFIERS.get().get(blockId);
int z = 0; // Set the correct position offset and rotation when sleeping
int bedId = 0; int bedRotation = 0;
float bedPositionSubtractorW = 0; float xOffset = 0;
float bedPositionSubtractorN = 0; float zOffset = 0;
Vector3i bedPosition = metadata.getPos(EntityData.BED_POSITION, null); if (fullIdentifier.contains("facing=south")) {
if (bedPosition != null) { // bed is facing south
bedId = session.getConnector().getWorldManager().getBlockAt(session, bedPosition); bedRotation = 180;
zOffset = -.5f;
} else if (fullIdentifier.contains("facing=east")) {
// bed is facing east
bedRotation = 90;
xOffset = -.5f;
} else if (fullIdentifier.contains("facing=west")) {
// bed is facing west
bedRotation = 270;
xOffset = .5f;
} else if (fullIdentifier.contains("facing=north")) {
// rotation does not change because north is 0
zOffset = .5f;
} }
String bedRotationZ = BlockRegistries.JAVA_IDENTIFIERS.get().get(bedId);
setRotation(rotation); setRotation(rotation);
setOnGround(isOnGround); setOnGround(isOnGround);
this.position = Vector3f.from(position.getX() + relX, position.getY() + relY, position.getZ() + relZ); this.position = Vector3f.from(position.getX() + relX, position.getY() + relY, position.getZ() + relZ);
MoveEntityAbsolutePacket moveEntityPacket = new MoveEntityAbsolutePacket(); MoveEntityAbsolutePacket moveEntityPacket = new MoveEntityAbsolutePacket();
moveEntityPacket.setRuntimeEntityId(geyserId); moveEntityPacket.setRuntimeEntityId(geyserId);
//Sets Villager position and rotation when sleeping moveEntityPacket.setRotation(Vector3f.from(0, 0, bedRotation));
Pattern r = Pattern.compile("facing=([a-z]+)"); moveEntityPacket.setPosition(Vector3f.from(position.getX() + xOffset, position.getY(), position.getZ() + zOffset));
Matcher m = r.matcher(bedRotationZ);
if (m.find()) {
switch (m.group(0)) {
case "facing=south":
//bed is facing south
z = 180;
bedPositionSubtractorW = -.5f;
break;
case "facing=east":
//bed is facing east
z = 90;
bedPositionSubtractorW = -.5f;
break;
case "facing=west":
//bed is facing west
z = 270;
bedPositionSubtractorW = .5f;
break;
case "facing=north":
//rotation does not change because north is 0
bedPositionSubtractorN = .5f;
break;
}
}
moveEntityPacket.setRotation(Vector3f.from(0, 0, z));
moveEntityPacket.setPosition(Vector3f.from(position.getX() + bedPositionSubtractorW, position.getY(), position.getZ() + bedPositionSubtractorN));
moveEntityPacket.setOnGround(isOnGround); moveEntityPacket.setOnGround(isOnGround);
moveEntityPacket.setTeleported(false); moveEntityPacket.setTeleported(false);
session.sendUpstreamPacket(moveEntityPacket); session.sendUpstreamPacket(moveEntityPacket);