Compare commits
82
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4ee29a9d82
|
||
|
|
e3f9505144
|
||
|
|
dd805b2c4c | ||
|
|
f639b13527 | ||
|
|
7f93f43538 | ||
|
|
5ecb83cd32 | ||
|
|
8bea16af0c | ||
|
|
3e627c4f3e | ||
|
|
2a8b6c8ebe | ||
|
|
050fb29b85 | ||
|
|
2285890116 | ||
|
|
77f5170adb | ||
|
|
3eff6cd72d | ||
|
|
4173f2c12a | ||
|
|
e39933e086 | ||
|
|
ec907cfbe6 | ||
|
|
245c02f588 | ||
|
|
aa9e04fd2f | ||
|
|
f5bf79b0f7 | ||
|
|
df2a9bf7be | ||
|
|
255490458e | ||
|
|
e78d65d1ac | ||
|
|
87867e623b | ||
|
|
89d6dae3e9 | ||
|
|
d2a9ffbe33 | ||
|
|
1a1c2b0dba | ||
|
|
cad2e19e74 | ||
|
|
c172275950 | ||
|
|
fcb1a05867 | ||
|
|
94f2254007 | ||
|
|
75d46368a5 | ||
|
|
e0347f8f46 | ||
|
|
ebed48f48a | ||
|
|
09901d58e9 | ||
|
|
6d4edcb51f | ||
|
|
e6a539223b | ||
|
|
11abd2659d | ||
|
|
ed2bf0d8d8 | ||
|
|
b3c83308a9 | ||
|
|
4719b2291b | ||
|
|
be2fe7d135 | ||
|
|
868c84685c | ||
|
|
f9caa2b83a | ||
|
|
92547f33f5 | ||
|
|
7b4029512e | ||
|
|
14154d693a | ||
|
|
286bccdb5a | ||
|
|
bf7c2d0e82 | ||
|
|
162dd9d31e | ||
|
|
b3a03b1421 | ||
|
|
82af055a04 | ||
|
|
fc386b057c | ||
|
|
f364e834f9 | ||
|
|
15ecdc6de5 | ||
|
|
3ec982ab54 | ||
|
|
d7ab0c6b69 | ||
|
|
4a44064e4b | ||
|
|
4c8f21e172 | ||
|
|
05b2fb0b21 | ||
|
|
3682aa9b2c | ||
|
|
906a08a4d5 | ||
|
|
cff5b5a74e | ||
|
|
f038e26663 | ||
|
|
5901f9829f | ||
|
|
4b1a04dc42 | ||
|
|
9c3746790a | ||
|
|
8a0f20bd95 | ||
|
|
e76afe5d6a | ||
|
|
e2fdbec6cf | ||
|
|
f6bcb08b7a | ||
|
|
79e8da3f78 | ||
|
|
2814a07cc8 | ||
|
|
af241821c7 | ||
|
|
52848cea3d | ||
|
|
ceb3a13bde | ||
|
|
7036e9fdab | ||
|
|
cecb6e6af2 | ||
|
|
3c4af4cda2 | ||
|
|
1ee5497c8c | ||
|
|
a3b4166e58 | ||
|
|
c0ca37f73b | ||
|
|
23a296e74c |
No files matched your search
@@ -3,3 +3,4 @@
|
||||
# are changed when only line endings change.
|
||||
src/generated/**/.cache/cache text eol=lf
|
||||
src/generated/**/*.json text eol=lf
|
||||
.gitea/CODEOWNERS linguist-detectable=false
|
||||
@@ -0,0 +1,3 @@
|
||||
# Pull requests request review from the eligible staff team(s).
|
||||
# One approval from either an Admin or Developer satisfies branch protection.
|
||||
* @trueog/Admins @trueog/Developers
|
||||
+1
-1
Submodule coreSubProjects updated: da2454b249...f5788b79f0.
@@ -131,7 +131,7 @@ public class DhSupport implements Configurable
|
||||
this.warning("If you understand what this means and would like to disable this warning, set " + DhsConfig.GENERATE_NEW_CHUNKS_WARNING + " to false in your config.");
|
||||
}
|
||||
|
||||
if (this.getConfig().getBool(DhsConfig.CHECK_FOR_UPDATES, true)) {
|
||||
if (this.getConfig().getBool(DhsConfig.CHECK_FOR_UPDATES, false)) {
|
||||
this.getScheduler().runOnSeparateThread(() -> {
|
||||
this.checkUpdates();
|
||||
return null;
|
||||
@@ -507,7 +507,16 @@ public class DhSupport implements Configurable
|
||||
return;
|
||||
}
|
||||
|
||||
this.debug("Touched LOD at " + this.getWorldInterface(worldId).getName() + " " + x + " " + z + (reason == null ? "." : ": " + reason));
|
||||
WorldInterface world = this.getWorldInterface(worldId);
|
||||
|
||||
if (world == null) {
|
||||
this.debug("Ignoring touched LOD for unloaded world " + worldId + " " + x + " " + z
|
||||
+ (reason == null ? "." : ": " + reason));
|
||||
return;
|
||||
}
|
||||
|
||||
this.debug("Touched LOD at " + world.getName() + " " + x + " " + z
|
||||
+ (reason == null ? "." : ": " + reason));
|
||||
|
||||
this.touchedLods.put(key, lodModel);
|
||||
}
|
||||
@@ -527,8 +536,18 @@ public class DhSupport implements Configurable
|
||||
LodModel lodModelToDelete = this.touchedLods.get(key);
|
||||
this.touchedLods.remove(key);
|
||||
|
||||
if (lodModelToDelete == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
WorldInterface world = this.getWorldInterface(lodModelToDelete.getWorldId());
|
||||
|
||||
if (world == null) {
|
||||
this.debug("Dropping touched LOD for unloaded world " + lodModelToDelete.getWorldId() + " "
|
||||
+ lodModelToDelete.getX() + " " + lodModelToDelete.getZ() + ".");
|
||||
continue;
|
||||
}
|
||||
|
||||
this.debug("Changes detected in " + world.getName() + " " + lodModelToDelete.getX() + " " + lodModelToDelete.getZ() + ".");
|
||||
|
||||
this.getLodRepository().lodExistsAsync(lodModelToDelete.getWorldId(), lodModelToDelete.getX(), lodModelToDelete.getZ()).thenAccept((exists) -> {
|
||||
@@ -574,8 +593,15 @@ public class DhSupport implements Configurable
|
||||
int playersOutOfRangeCount = 0;
|
||||
int playersWithoutDhCount = 0;
|
||||
|
||||
org.bukkit.World bukkitWorld = Bukkit.getWorld(newLodModel.getWorldId());
|
||||
|
||||
if (bukkitWorld == null) {
|
||||
this.debug("Skipping real-time LOD update for unloaded world " + newLodModel.getWorldId() + ".");
|
||||
return;
|
||||
}
|
||||
|
||||
// TODO: Don't use Bukkit classes.
|
||||
for (Player player : Bukkit.getWorld(newLodModel.getWorldId()).getPlayers()) {
|
||||
for (Player player : bukkitWorld.getPlayers()) {
|
||||
Configuration playerConfig = this.getPlayerConfiguration(player.getUniqueId());
|
||||
|
||||
// No config for this player? Probably not using DH.
|
||||
|
||||
@@ -27,7 +27,7 @@ real_time_updates_enabled: true
|
||||
# How close to an update players have to be in order to receive it.
|
||||
# Required.
|
||||
# Default: 128
|
||||
real_time_update_radius: 128
|
||||
real_time_update_radius: 256
|
||||
|
||||
# Let clients ask for updates to LODs they've previously downloaded.
|
||||
# Required.
|
||||
@@ -37,7 +37,7 @@ login_data_sync_enabled: true
|
||||
# How far away can a player request updates for during login sync?
|
||||
# Required.
|
||||
# Default: 128
|
||||
login_data_sync_radius: 128
|
||||
login_data_sync_radius: 64
|
||||
|
||||
# How many login sync requests can a client send at once?
|
||||
# Required.
|
||||
@@ -53,12 +53,12 @@ max_data_transfer_speed: 0
|
||||
# If you disable this, the plugin will not be able to create LODs in areas where chunks don't already exist.
|
||||
# Optional.
|
||||
# Default: true
|
||||
#generate_new_chunks: false
|
||||
generate_new_chunks: false
|
||||
|
||||
# Show warning during startup if chunk generation is enabled?
|
||||
# Optional.
|
||||
# Default: true
|
||||
#generate_new_chunks_warning: false
|
||||
generate_new_chunks_warning: true
|
||||
|
||||
# How frequently (in seconds) should LODs be updated if world changes are detected?
|
||||
# Required.
|
||||
@@ -117,7 +117,7 @@ worlds:
|
||||
# Enable if your world has floating islands or mountains/structures with large overhangs above sea level.
|
||||
# Optional.
|
||||
# Default: false
|
||||
#scan_to_sea_level: true
|
||||
scan_to_sea_level: true
|
||||
|
||||
# When using the FastOverworldBuilder, should the bottom data point be stretched to the lowest permitted build
|
||||
# height? This will make the LODs look more complete, and gives a theoretical boost to render performance.
|
||||
@@ -134,12 +134,12 @@ worlds:
|
||||
world_nether:
|
||||
# It might make sense to have a lower view distance in the nether, since visibility will be low simply because of
|
||||
# the level design anyway.
|
||||
render_distance: 64
|
||||
render_distance: 128
|
||||
|
||||
# This is a hack to prevent light from shining through ceilings, mostly noticeable on the nether ceiling.
|
||||
# Only works with the FullBuilder, should only be used with builder_resolution=1, and does have some side effects.
|
||||
#perform_underglow_hack: true
|
||||
#builder_resolution: 1
|
||||
perform_underglow_hack: true
|
||||
builder_resolution: 1
|
||||
|
||||
# List of events that should trigger LOD updates.
|
||||
# Required.
|
||||
@@ -166,12 +166,12 @@ update_events:
|
||||
# Does not affect Folia servers.
|
||||
# Required.
|
||||
# Default: 4
|
||||
scheduler_threads: 4
|
||||
scheduler_threads: 8
|
||||
|
||||
# Should we notify server admins when a new version of the plugin is available?
|
||||
# Optional.
|
||||
# Default: true
|
||||
#check_for_updates: false
|
||||
# Default: false
|
||||
check_for_updates: false
|
||||
|
||||
# Enable debug logging?
|
||||
# Optional.
|
||||
|
||||
Reference in new issue
Block a user