GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-28 11:19:11 +00:00
Code Issues Releases Activity

Remove debug print, validate that entity definitions have been registered, setup publishing

Browse Source
This commit is contained in:
onebeastchris
2025-12-01 15:53:48 +01:00
parent f3070f7509
commit 8a79001b4b
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/build.yml vendored
View File

@@ -51,7 +51,16 @@ jobs:
bootstrap/viaproxy/build/libs/Geyser-ViaProxy.jar
- name: Publish to Maven Repository
if: ${{ success() && github.repository == 'GeyserMC/Geyser' && github.ref_name == 'master' }}
if: >-
${{
success() &&
github.repository == 'GeyserMC/Geyser' &&
(
github.ref_name == 'master' ||
(github.event.pull_request &&
contains(github.event.pull_request.labels.*.name, 'PR: Needs Testing'))
)
}}
run: ./gradlew publish
env:
BUILD_NUMBER: ${{ steps.release-info.outputs.curentRelease }}

32
core/src/main/java/org/geysermc/geyser/entity/spawn/EntitySpawnContext.java
View File

@@ -161,13 +161,17 @@ public class EntitySpawnContext {
public void definition(@Nullable GeyserEntityDefinition entityDefinition) {
if (entityDefinition == null) {
bedrockEntityDefinition = null;
} else {
if (entityDefinition instanceof BedrockEntityDefinition bed) {
bedrockEntityDefinition = bed;
} else {
throw new IllegalStateException("Unknown implementation of GeyserEntityDefinition");
}
}
if (!(entityDefinition instanceof BedrockEntityDefinition definition)) {
throw new IllegalStateException("Unknown implementation of GeyserEntityDefinition");
}
if (!entityDefinition.registered()) {
throw new IllegalStateException("%s is not registered!".formatted(entityDefinition.identifier()));
}
bedrockEntityDefinition = definition;
}
@Override
@@ -208,13 +212,17 @@ public class EntitySpawnContext {
public void definition(@Nullable GeyserEntityDefinition entityDefinition) {
if (entityDefinition == null) {
bedrockEntityDefinition = null;
} else {
if (entityDefinition instanceof BedrockEntityDefinition bed) {
bedrockEntityDefinition = bed;
} else {
throw new IllegalStateException("Unknown implementation of GeyserEntityDefinition");
}
}
if (!(entityDefinition instanceof BedrockEntityDefinition definition)) {
throw new IllegalStateException("Unknown implementation of GeyserEntityDefinition");
}
if (!entityDefinition.registered()) {
throw new IllegalStateException("%s is not registered!".formatted(entityDefinition.identifier()));
}
bedrockEntityDefinition = definition;
}
@Override

2
core/src/main/java/org/geysermc/geyser/entity/type/player/PlayerEntity.java
View File

@@ -163,7 +163,7 @@ public class PlayerEntity extends AvatarEntity implements GeyserPlayerEntity {
// The parrot is a separate entity in Bedrock, but part of the player entity in Java
EntitySpawnContext context = EntitySpawnContext.inherited(session, VanillaEntities.PARROT, this, position);
if (context.callParrotEvent(this, variant.getAsInt(), !isLeft)) {
GeyserImpl.getInstance().getLogger().debug("TODO");
GeyserImpl.getInstance().getLogger().debug(session, "Cancelled parrot spawn as definition is null!");
return;
}
ParrotEntity parrot = new ParrotEntity(context);

2
core/src/main/java/org/geysermc/geyser/session/cache/TeleportCache.java vendored
View File

@@ -28,7 +28,6 @@ package org.geysermc.geyser.session.cache;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.cloudburstmc.math.vector.Vector3f;
import org.geysermc.geyser.GeyserImpl;
/**
* Represents a teleport ID and corresponding coordinates that need to be confirmed. <br>
@@ -69,7 +68,6 @@ public class TeleportCache {
private int unconfirmedFor = 0;
public boolean canConfirm(Vector3f position) {
GeyserImpl.getInstance().getLogger().info("TeleportCache_canConfirm " + position + " " + this.position);
final float distanceX = Math.abs(this.position.getX() - position.getX());
final float distanceY = Math.abs(this.position.getY() - position.getY());
final float distanceZ = Math.abs(this.position.getZ() - position.getZ());