Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #426 #428

Merged
merged 5 commits into from
Feb 23, 2024
Merged

Fixes #426 #428

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6248ae2
Fixes #426
TheVeryStarlk Feb 21, 2024
94b7c45
Fix initial view distance chunks
TheVeryStarlk Feb 22, 2024
77ce704
Fix minimum view distance
TheVeryStarlk Feb 23, 2024
fa7f8f6
Merge remote-tracking branch 'origin/master'
TheVeryStarlk Feb 23, 2024
9227f37
Create a `const` for the minimum view distance.
TheVeryStarlk Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Obsidian.API/_Interfaces/IServerConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,14 @@ public interface IServerConfiguration
/// </summary>
public RconConfig? Rcon { get; set; }

/// <summary>
/// The view distance of the server.
/// </summary>
/// <remarks>
/// Players with higher view distance will use the server's view distance.
/// </remarks>
public byte ViewDistance { get; set; }

public List<string> WhitelistedIPs { get; set; }
public List<WhitelistedPlayer> Whitelisted { get; set; }
}
2 changes: 1 addition & 1 deletion Obsidian/Net/Packets/ClientInformationPacket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public async ValueTask HandleAsync(Server server, Player player)
player.ClientInformation = new()
{
Locale = this.Locale,
ViewDistance = this.ViewDistance,
ViewDistance = sbyte.Min(ViewDistance, (sbyte) server.Configuration.ViewDistance),
ChatMode = this.ChatMode,
ChatColors = this.ChatColors,
DisplayedSkinParts = this.DisplayedSkinParts,
Expand Down
8 changes: 8 additions & 0 deletions Obsidian/Utilities/ServerConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ public sealed class ServerConfiguration : IServerConfiguration

public bool AllowLan { get; set; } = true; // Enabled because it's super useful for debugging tbh

public byte ViewDistance
{
get => viewDistance;
set => viewDistance = value >= 3 ? value : (byte) 3;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider a const variable for 3

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea.

}

public int PregenerateChunkRange { get; set; } = 15; // by default, pregenerate range from -15 to 15

[JsonConverter(typeof(JsonStringEnumConverter))]
Expand All @@ -64,6 +70,8 @@ public sealed class ServerConfiguration : IServerConfiguration
public ServerListQuery ServerListQuery { get; set; } = ServerListQuery.Full;

public int TimeTickSpeedMultiplier { get; set; } = 1;

private byte viewDistance = 10;
}

public sealed class ServerWorld
Expand Down
Loading