1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-16 18:31:53 +01:00

apply fixup

I managed to move it, yet forgot to actually fix it up...
This commit is contained in:
Mariell Hoversholm 2021-03-19 07:50:12 +01:00
parent c310f0a610
commit 9889c651ce
243 changed files with 15 additions and 25 deletions
Spigot-Server-Patches
0453-Load-Chunks-for-Login-Asynchronously.patch0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch0454-fixup-Load-chunks-asynchronously-for-players.patch0455-Add-PlayerAttackEntityCooldownResetEvent.patch0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch0457-Don-t-fire-BlockFade-on-worldgen-threads.patch0458-Add-phantom-creative-and-insomniac-controls.patch0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch0460-Implement-Brigadier-Mojang-API.patch0461-Villager-Restocks-API.patch0462-Validate-PickItem-Packet-and-kick-for-invalid.patch0463-Expose-game-version.patch0464-Optimize-Voxel-Shape-Merging.patch0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch0466-Implement-Mob-Goal-API.patch0467-Use-distance-map-to-optimise-entity-tracker.patch0468-Optimize-isOutsideRange-to-use-distance-maps.patch0469-Stop-copy-on-write-operations-for-updating-light-dat.patch0470-No-Tick-view-distance-implementation.patch0471-Add-villager-reputation-API.patch0472-Fix-Light-Command.patch0473-Fix-PotionEffect-ignores-icon-flag.patch0474-Optimize-brigadier-child-sorting-performance.patch0475-Potential-bed-API.patch0476-Wait-for-Async-Tasks-during-shutdown.patch0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch0479-Optimize-NibbleArray-to-use-pooled-buffers.patch0480-Reduce-MutableInt-allocations-from-light-engine.patch0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch0482-Ensure-safe-gateway-teleport.patch0483-Add-option-for-console-having-all-permissions.patch0484-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch0488-Improve-Chunk-Status-Transition-Speed.patch0489-Fix-villager-trading-demand-MC-163962.patch0490-Maps-shouldn-t-load-chunks.patch0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch0492-Optimize-Bit-Operations-by-inlining.patch0493-Optimize-Light-Engine.patch0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch0496-Fix-missing-chunks-due-to-integer-overflow.patch0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch0498-Fix-piston-physics-inconsistency-MC-188840.patch0499-Fix-sand-duping.patch0500-Prevent-position-desync-in-playerconnection-causing-.patch0501-Fix-enderdragon-exp-dupe.patch0502-Inventory-getHolder-method-without-block-snapshot.patch0503-Expose-Arrow-getItemStack.patch0504-Add-and-implement-PlayerRecipeBookClickEvent.patch0505-Hide-sync-chunk-writes-behind-flag.patch0506-Limit-lightning-strike-effect-distance.patch0507-Add-permission-for-command-blocks.patch0508-Ensure-Entity-AABB-s-are-never-invalid.patch0509-Optimize-WorldBorder-collision-checks-and-air.patch0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch0511-Paper-dumpitem-command.patch0512-Don-t-allow-null-UUID-s-for-chat.patch0513-Improve-Legacy-Component-serialization-size.patch0514-Support-old-UUID-format-for-NBT.patch0515-Clean-up-duplicated-GameProfile-Properties.patch0516-Convert-legacy-attributes-in-Item-Meta.patch0517-Remove-some-streams-from-structures.patch0518-Remove-streams-from-classes-related-villager-gossip.patch0519-Support-components-in-ItemMeta.patch0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch0521-Add-entity-liquid-API.patch0522-Update-itemstack-legacy-name-and-lore.patch0523-Spawn-player-in-correct-world-on-login.patch0524-Add-PrepareResultEvent.patch0525-Allow-delegation-to-vanilla-chunk-gen.patch0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch0527-Optimize-NetworkManager-Exception-Handling.patch0528-Fix-Concurrency-issue-in-WeightedList.patch0529-Optimize-the-advancement-data-player-iteration-to-be.patch0530-Fix-arrows-never-despawning-MC-125757.patch0531-Thread-Safe-Vanilla-Command-permission-checking.patch0532-Move-range-check-for-block-placing-up.patch0533-Fix-SPIGOT-5989.patch0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch0538-Fix-some-rails-connecting-improperly.patch0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch0540-Incremental-player-saving.patch0541-Import-fastutil-classes.patch0542-Don-t-mark-null-chunk-sections-for-block-updates.patch0543-Remove-armour-stand-double-add-to-world.patch0544-Fix-MC-187716-Use-configured-height.patch0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch0546-Do-not-let-the-server-load-chunks-from-newer-version.patch0547-Brand-support.patch0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch0549-Fix-MC-197271.patch0550-MC-197883-Bandaid-decode-issue.patch0551-Add-setMaxPlayers-API.patch

View file

@ -18,10 +18,18 @@ index 6e5d21af43261dc2f12ceec7b7e3269be635cf7a..ecf4cd6dfea777ab9daea0b40724d247
boolean flag1 = this.playerChunkMap.b();
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
index eaeac60b2d54d8e7d298ea412d888471a7ea9e79..2ca9335129465ffb67617b42534db530c1d78923 100644
index eaeac60b2d54d8e7d298ea412d888471a7ea9e79..36b4792687a5c6316bf95995e761bf4aa49779f6 100644
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
@@ -174,6 +174,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -31,6 +31,7 @@ import net.minecraft.core.NonNullList;
import net.minecraft.core.SectionPosition;
import net.minecraft.nbt.DynamicOpsNBT;
import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetworkManager;
import net.minecraft.network.chat.ChatComponentText;
import net.minecraft.network.chat.ChatHoverable;
import net.minecraft.network.chat.ChatMessage;
@@ -174,6 +175,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
private static final Logger LOGGER = LogManager.getLogger();
public PlayerConnection playerConnection;
@ -29,7 +37,7 @@ index eaeac60b2d54d8e7d298ea412d888471a7ea9e79..2ca9335129465ffb67617b42534db530
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
public final Deque<Integer> removeQueue = new ArrayDeque<>(); // Paper
@@ -240,6 +241,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -240,6 +242,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public boolean joining = true;
public boolean sentListPacket = false;
public boolean supressTrackerForLogin = false; // Paper

View file

@ -1,18 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Tue, 16 Mar 2021 11:25:11 +0100
Subject: [PATCH] fixup! Load chunks asynchronously for players.
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
index 2ca9335129465ffb67617b42534db530c1d78923..36b4792687a5c6316bf95995e761bf4aa49779f6 100644
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
@@ -31,6 +31,7 @@ import net.minecraft.core.NonNullList;
import net.minecraft.core.SectionPosition;
import net.minecraft.nbt.DynamicOpsNBT;
import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetworkManager;
import net.minecraft.network.chat.ChatComponentText;
import net.minecraft.network.chat.ChatHoverable;
import net.minecraft.network.chat.ChatMessage;

View file

@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
Set system properly at server startup if not set already to help protect from this.
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 2a36de929e6d433b0f67f0a901c03c624cd41e17..af1b93beee1cf4ea1be356eb47ef9a3c8d0f2837 100644
index 3348d0466e340acc8f143ec98a4b26f23939d8a7..23389d0a0e7bd8aeb2f1ab0ea6a149ef99e800fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -22,6 +22,7 @@ public class Main {

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
diff --git a/pom.xml b/pom.xml
index d6e313021d268c5d865394859b3d748edf1b061c..70c0fb4621b16c33d7cdf7d920c17bfe1ff8d831 100644
index 14e66414d043ce720b8fd7bfa2c476d8369c757b..25ec9c4f8c08551fd80a597a1b39854e70e4f895 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,13 @@

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index c0f5fdb832115c5a86005e4c3242d9fd7e52f82c..6a15a5f7d3e82f61c0f30bb6a339215376d4867d 100644
index 1732fc552c290d294b68d6f92f2a58d985fbef21..3dcbeec94d86f3b56eaf05676b176f60d711f9cd 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -132,11 +132,20 @@ public class Main {

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index 6a15a5f7d3e82f61c0f30bb6a339215376d4867d..f34d5b214c4726f3b3b96610c1dca3d0d17a09ab 100644
index 3dcbeec94d86f3b56eaf05676b176f60d711f9cd..6818f8496ab76ee6ffc747bd6848b43830ec8914 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -132,6 +132,7 @@ public class Main {

Some files were not shown because too many files have changed in this diff Show more