3
0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-12-27 08:30:12 +01:00

Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/configurate

Dieser Commit ist enthalten in:
Camotoy 2024-05-26 17:44:24 -04:00
Commit dedb5920c2
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 7EEFB66FE798081F
2 geänderte Dateien mit 5 neuen und 2 gelöschten Zeilen

Datei anzeigen

@ -94,7 +94,7 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration
private boolean debugMode = false; private boolean debugMode = false;
@JsonProperty("allow-third-party-capes") @JsonProperty("allow-third-party-capes")
private boolean allowThirdPartyCapes = true; private boolean allowThirdPartyCapes = false;
@JsonProperty("show-cooldown") @JsonProperty("show-cooldown")
private String showCooldown = "title"; private String showCooldown = "title";

Datei anzeigen

@ -80,7 +80,10 @@ public class InteractionEntity extends Entity {
} }
public void setHeight(FloatEntityMetadata height) { public void setHeight(FloatEntityMetadata height) {
setBoundingBoxHeight(height.getPrimitiveValue()); // Bedrock does *not* like high values being placed here
// https://gist.github.com/Owen1212055/f5d59169d3a6a5c32f0c173d57eb199d recommend(s/ed) using the tactic
// https://github.com/GeyserMC/Geyser/issues/4688
setBoundingBoxHeight(Math.min(height.getPrimitiveValue(), 64f));
} }
public void setResponse(BooleanEntityMetadata response) { public void setResponse(BooleanEntityMetadata response) {