OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-10-23 17:06:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix NPE with dimension handling in online mode

Browse source 
This change should be fine since all dimensions are iterated through in the registry cache
This commit is contained in:
Camotoy 2024-10-03 18:02:01 -04:00
parent 26c4c5250a
commit 4820893792
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View file

@ -716,9 +716,10 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
* Send all necessary packets to load Bedrock into the server
*/
public void connect() {
int minY = this.dimensionType.minY();
int maxY = this.dimensionType.maxY();
for (JavaDimension javaDimension : this.getRegistryCache().dimensions().values()) {
// Note: this.dimensionType may be null here if the player is connecting from online mode
int minY = BedrockDimension.OVERWORLD.minY();
int maxY = BedrockDimension.OVERWORLD.maxY();
for (JavaDimension javaDimension : this.registryCache.dimensions().values()) {
if (javaDimension.bedrockId() == BedrockDimension.OVERWORLD_ID) {
minY = Math.min(minY, javaDimension.minY());
maxY = Math.max(maxY, javaDimension.maxY());