mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
Do not create unneccessary callback in ChunkTaskScheduler#scheduleChunkLoad
If the parameter has addTicket = false and onComplete = null, then the loadCallback would do no work and as a result does not need to be created.
This commit is contained in:
parent
989fd77808
commit
f7086a34b5
1 changed files with 5 additions and 3 deletions
|
@ -8831,7 +8831,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ this.chunkHolderManager.processTicketUpdates();
|
+ this.chunkHolderManager.processTicketUpdates();
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ final Consumer<ChunkAccess> loadCallback = (final ChunkAccess chunk) -> {
|
+ final Consumer<ChunkAccess> loadCallback = onComplete == null && !addTicket ? null : (final ChunkAccess chunk) -> {
|
||||||
+ try {
|
+ try {
|
||||||
+ if (onComplete != null) {
|
+ if (onComplete != null) {
|
||||||
+ onComplete.accept(chunk);
|
+ onComplete.accept(chunk);
|
||||||
|
@ -8868,7 +8868,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ if (!chunkHolder.upgradeGenTarget(toStatus)) {
|
+ if (!chunkHolder.upgradeGenTarget(toStatus)) {
|
||||||
+ this.schedule(chunkX, chunkZ, toStatus, chunkHolder, tasks);
|
+ this.schedule(chunkX, chunkZ, toStatus, chunkHolder, tasks);
|
||||||
+ }
|
+ }
|
||||||
+ chunkHolder.addStatusConsumer(toStatus, loadCallback);
|
+ if (loadCallback != null) {
|
||||||
|
+ chunkHolder.addStatusConsumer(toStatus, loadCallback);
|
||||||
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+ } finally {
|
+ } finally {
|
||||||
|
@ -8882,7 +8884,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ tasks.get(i).schedule();
|
+ tasks.get(i).schedule();
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ if (!scheduled) {
|
+ if (loadCallback != null && !scheduled) {
|
||||||
+ // couldn't schedule
|
+ // couldn't schedule
|
||||||
+ try {
|
+ try {
|
||||||
+ loadCallback.accept(chunk);
|
+ loadCallback.accept(chunk);
|
||||||
|
|
Loading…
Reference in a new issue