Skip to content

Commit 13404e8

Browse files
committed
Update to 1.19.10
1 parent 6348149 commit 13404e8

File tree

4 files changed

+26280
-13913
lines changed

4 files changed

+26280
-13913
lines changed

src/Alex/Entities/BlockEntities/BeaconBlockEntity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ protected override void ReadFrom(NbtCompound compound)
111111
}
112112

113113
if (compound.TryGet<NbtInt>("Secondary", out var secondary)
114-
|| compound.TryGet<NbtInt>("secondary", out primary))
114+
|| compound.TryGet<NbtInt>("secondary", out secondary))
115115
{
116116
if (secondary.Value >= 0)
117117
{

src/Alex/Net/Bedrock/BedrockClientPacketHandler.cs

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,12 @@ public void HandleMcpeSetTime(McpeSetTime message)
240240

241241
Client.ChangeDimensionResetEvent.Set();
242242
}
243-
243+
244244
public void HandleMcpeStartGame(McpeStartGame message)
245245
{
246246
Log.Warn($"Experimental gameplay override={message.levelSettings.experimentalGameplayOverride} Experiments={message.levelSettings.experiments.Count} BaseGameVersion={message.levelSettings.gameVersion}");
247247

248-
if (message.levelSettings.gameVersion.Trim().StartsWith("1.17"))
248+
if ( message.levelSettings.gameVersion.Trim().StartsWith("1.17"))
249249
{
250250
ChunkProcessor.WorldSettings = new WorldSettings(256, 0);
251251
}
@@ -407,9 +407,10 @@ public void HandleMcpeAddPlayer(McpeAddPlayer message)
407407
remotePlayer.HandleMetadata(message.metadata);
408408
}
409409

410-
UpdateEntityAdventureFlags(
411-
remotePlayer, message.flags, message.actionPermissions, message.commandPermission,
412-
message.permissionLevel, message.customStoredPermissions);
410+
//TODO: Fix adventure flags
411+
//UpdateEntityAdventureFlags(
412+
// remotePlayer, message.flags, message.actionPermissions, message.commandPermission,
413+
// message.permissionLevel, message.customStoredPermissions);
413414

414415
Client.World.SpawnEntity(remotePlayer);
415416

@@ -704,9 +705,17 @@ public void HandleMcpeAvailableEntityIdentifiers(McpeAvailableEntityIdentifiers
704705
{
705706
foreach (NbtCompound tag in ids.ToArray<NbtCompound>())
706707
{
707-
if (tag.TryGet("id", out NbtString id) && tag.TryGet("rid", out NbtInt realId))
708+
if (tag.TryGet("id", out NbtString id) && tag.TryGet("rid", out var realId))
708709
{
709-
_entityIdentifiers[id.Value] = realId.Value;
710+
int identifier = 0;
711+
712+
if (realId is NbtInt nbtInt)
713+
identifier = nbtInt.Value;
714+
715+
if (realId is NbtByte nbtByte)
716+
identifier = nbtByte.Value;
717+
718+
_entityIdentifiers[id.Value] = identifier;
710719

711720
if (LoggingConstants.LogServerEntityDefinitions)
712721
#pragma warning disable CS0162

0 commit comments

Comments
 (0)