Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 00:39:22 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2024-07-11 01:50:21 +08:00
parent 7765705396
commit 863a94bd06
19 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.21-R0.1-SNAPSHOT
mcVersion=1.21
paperRef=b0ef3ca25ab162c7eefda819b7a24574e5c44e6c
paperRef=20889d04d8c7a11ff76061d99abcb58acd470fe7
org.gradle.caching=false
org.gradle.parallel=true

4
patches/api/0003-Gale-configuration.patch
View File

@@ -13,10 +13,10 @@ As part of: Paper (https://github.com/PaperMC/Paper)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index bbc4d7d3ca84642828f9a3f788ca26bba900d15b..17aaca2d039eb9c0816a9bdde0876a4debcaeb9d 100644
index c043d239c449bf4bb13a24467f2f6c67b4d28d2d..03150301d3e189b659db7c41427365c9fb665074 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2249,6 +2249,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2252,6 +2252,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
{
throw new UnsupportedOperationException("Not supported yet.");
}

8
patches/api/0009-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b9b751ea0d11381e846d5f35f39f285c075c171a..3157818826a08fc64e6aafa269cb53a0797f3a4d 100644
index 4705c1d91e39fcc3c608b1f1a38a30d063ccf06e..6c57ec1b69745534f0d49060d0abba5ac7839cc5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2371,6 +2371,37 @@ public final class Bukkit {
@@ -2374,6 +2374,37 @@ public final class Bukkit {
return server.getTPS();
}
@@ -49,10 +49,10 @@ index b9b751ea0d11381e846d5f35f39f285c075c171a..3157818826a08fc64e6aafa269cb53a0
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 17aaca2d039eb9c0816a9bdde0876a4debcaeb9d..d8e78424809ee1e1107e37a32552d57c24fa48b0 100644
index 03150301d3e189b659db7c41427365c9fb665074..846ff47c1deaf63880007e1da0ac5ac0769b2162 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2028,6 +2028,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2031,6 +2031,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

8
patches/api/0010-5-second-TPS-average.patch
View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3157818826a08fc64e6aafa269cb53a0797f3a4d..4e2e5b2727ccfdd2f029ad786e0165f37f7e2144 100644
index 6c57ec1b69745534f0d49060d0abba5ac7839cc5..f78b4e020403b91f57854e44a163e800bb225d1d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2371,8 +2371,30 @@ public final class Bukkit {
@@ -2374,8 +2374,30 @@ public final class Bukkit {
return server.getTPS();
}
@@ -72,10 +72,10 @@ index 3157818826a08fc64e6aafa269cb53a0797f3a4d..4e2e5b2727ccfdd2f029ad786e0165f3
* Gets the average server TPS over the last 1 minute
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d8e78424809ee1e1107e37a32552d57c24fa48b0..9c032132d242c61facb89efe89b548ff051a2977 100644
index 846ff47c1deaf63880007e1da0ac5ac0769b2162..b8e42370b4018189c03837157f9dc2dcef8a4580 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2028,8 +2028,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2031,8 +2031,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

8
patches/api/0011-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 4e2e5b2727ccfdd2f029ad786e0165f37f7e2144..1ea2a7f598c6a214a6562ce6ad2e49e83c7149ab 100644
index f78b4e020403b91f57854e44a163e800bb225d1d..cd191a6039717c70d2b8be0ae475d040cad54f96 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2956,6 +2956,20 @@ public final class Bukkit {
@@ -2959,6 +2959,20 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -48,10 +48,10 @@ index 4e2e5b2727ccfdd2f029ad786e0165f37f7e2144..1ea2a7f598c6a214a6562ce6ad2e49e8
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9c032132d242c61facb89efe89b548ff051a2977..2732389405c054d34cf030ce46323ceaf899b61b 100644
index b8e42370b4018189c03837157f9dc2dcef8a4580..5b47d9cf775e06bfb1c897905b19346cb10f4de0 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2593,4 +2593,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2596,4 +2596,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API

4
patches/server/0005-Gale-branding-changes.patch
View File

@@ -528,10 +528,10 @@ index e85b9bb3f9c225d289a4959921970b9963881199..79192e3a0f27d48f35c0378b58e58721
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index d70c5546c8bd6f364fad9b24880b6867efdab644..4250752a95301271f09590f0140f821a0090811a 100644
index 3137391cadef7c67019561e65fedd0664e689eae..150769691fd0c6abad77a4823b5f7dd667a032d1 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -504,7 +504,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -498,7 +498,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

38
patches/server/0017-Remove-vanilla-profiler.patch
View File

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 3e454515360c22a26c9329e4032d525579110d7e..05745c9d55cb36fb09eb06f9412bf935f59fc3d0 100644
index 1d1e76de60e40224f5cb81893f9ee50fe987badb..09a973aa95d96924303c7e55521b9f20cbc036a0 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -55,7 +55,6 @@ import net.minecraft.server.commands.CloneCommands;
@@ -56,7 +56,7 @@ index 3e454515360c22a26c9329e4032d525579110d7e..05745c9d55cb36fb09eb06f9412bf935
DefaultGameModeCommands.register(this.dispatcher);
DifficultyCommand.register(this.dispatcher);
EffectCommands.register(this.dispatcher, commandRegistryAccess);
@@ -343,9 +341,6 @@ public class Commands {
@@ -340,9 +338,6 @@ public class Commands {
// Paper end
CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseresults.getContext().getSource();
@@ -66,7 +66,7 @@ index 3e454515360c22a26c9329e4032d525579110d7e..05745c9d55cb36fb09eb06f9412bf935
ContextChain contextchain = this.finishParsing(parseresults, s, commandlistenerwrapper, label); // CraftBukkit // Paper - Add UnknownCommandEvent
try {
@@ -374,8 +369,6 @@ public class Commands {
@@ -371,8 +366,6 @@ public class Commands {
commandlistenerwrapper.sendFailure(Component.literal(Util.describeError(exception)));
Commands.LOGGER.error("'/{}' threw an exception", s, exception);
}
@@ -75,7 +75,7 @@ index 3e454515360c22a26c9329e4032d525579110d7e..05745c9d55cb36fb09eb06f9412bf935
}
}
@@ -438,7 +431,7 @@ public class Commands {
@@ -435,7 +428,7 @@ public class Commands {
int j = minecraftserver.getGameRules().getInt(GameRules.RULE_MAX_COMMAND_FORK_COUNT);
try {
@@ -963,10 +963,10 @@ index b26efc77a7669fd6b0ef498df23f0f78f1361073..55c81b6fa0173ba32cd3f3cee448147a
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..3d1aff8318620bc87a439e095bc1d06e4dafbba1 100644
index 9d1e68c09fa7093cf0f6fa636f90cb15a44cbb38..57cc965c7147d0a1fac150e7bcae0f76d0b5c5ab 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1371,7 +1371,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -1373,7 +1373,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
this.unsetRemoved();
*/
// CraftBukkit end
@@ -974,7 +974,7 @@ index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..3d1aff8318620bc87a439e095bc1d06e
if (worldserver != null && resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit - empty to fall through to null to event
this.enteredNetherPosition = this.position();
}
@@ -1387,8 +1386,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -1389,8 +1388,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
worldserver = ((CraftWorld) exit.getWorld()).getHandle();
// CraftBukkit end
@@ -983,7 +983,7 @@ index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..3d1aff8318620bc87a439e095bc1d06e
// CraftBukkit start
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
LevelData worlddata = worldserver.getLevelData();
@@ -1405,7 +1402,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -1407,7 +1404,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
worldserver.addDuringTeleport(this);
@@ -1211,7 +1211,7 @@ index 83f3ffdd8fa901b3de580d2359cdb5ead0d762cb..0f3dedcc20007385bdbfd9cab5209255
}
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b9cef93fe382b666bec04ca95eeaf2d8acbb3c40..291f17ba3ad03cb4c989d9252ebeb556196f2148 100644
index 909accac7538e1c0c0c51deb2ee0605697c059d0..13187ad613637509a59e8b3ba37afacd1925549d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -440,7 +440,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1230,7 +1230,7 @@ index b9cef93fe382b666bec04ca95eeaf2d8acbb3c40..291f17ba3ad03cb4c989d9252ebeb556
}
@Override
@@ -3155,10 +3153,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3205,10 +3203,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1241,7 +1241,7 @@ index b9cef93fe382b666bec04ca95eeaf2d8acbb3c40..291f17ba3ad03cb4c989d9252ebeb556
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3170,7 +3165,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3220,7 +3215,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1249,7 +1249,7 @@ index b9cef93fe382b666bec04ca95eeaf2d8acbb3c40..291f17ba3ad03cb4c989d9252ebeb556
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3410,19 +3404,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3460,19 +3454,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1269,7 +1269,7 @@ index b9cef93fe382b666bec04ca95eeaf2d8acbb3c40..291f17ba3ad03cb4c989d9252ebeb556
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3449,8 +3438,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3499,8 +3488,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1278,7 +1278,7 @@ index b9cef93fe382b666bec04ca95eeaf2d8acbb3c40..291f17ba3ad03cb4c989d9252ebeb556
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3475,8 +3462,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3525,8 +3512,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1287,7 +1287,7 @@ index b9cef93fe382b666bec04ca95eeaf2d8acbb3c40..291f17ba3ad03cb4c989d9252ebeb556
if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3493,15 +3478,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3543,15 +3528,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}
@@ -1522,10 +1522,10 @@ index 69986f75d3cf729204cca0c7e5428536af31f695..a6b8c6540886af41ef1bccbd76784fe3
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
index 792d9039ac0561464c666977ff8308e4c629e5eb..a70077521a13d0fbdc987b39a89345442c8e8cc3 100644
index 729fd2d52dd48e25ee7a077a3ffafc80ecef7c9f..8ed9c15e90889a056382092c64eae406e5603ec0 100644
--- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
@@ -131,12 +131,8 @@ public class Armadillo extends Animal {
@@ -135,12 +135,8 @@ public class Armadillo extends Animal {
@Override
protected void customServerAiStep() {
@@ -1556,10 +1556,10 @@ index 01a0731e92d39c8718538244e34a271fb8717fc2..1147bf32f6efe02e51c838eb371f11c6
Optional<Integer> optional = this.getBrain().getMemory(MemoryModuleType.PLAY_DEAD_TICKS);
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index 147974651d37e81d81ca97bfa31c9df9867492be..61df975e45ca5704654bb5b295a6e36aec8623ee 100644
index 8941752e4600ccd11b3fa1147b2e414785589eed..c841a7c4d73a416d4722b4d409167ddba3304ae8 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -140,14 +140,10 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@@ -143,14 +143,10 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@Override
protected void customServerAiStep() {

4
patches/server/0031-Cache-on-climbable-check.patch
View File

@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 291f17ba3ad03cb4c989d9252ebeb556196f2148..daa8c9019bcd7062508444f1bd6e04bfb7daeb7b 100644
index 13187ad613637509a59e8b3ba37afacd1925549d..8b42a46cc48e7d4c8fac84f85ed89517e77bf920 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -42,7 +42,7 @@ index 291f17ba3ad03cb4c989d9252ebeb556196f2148..daa8c9019bcd7062508444f1bd6e04bf
public abstract class LivingEntity extends Entity implements Attackable {
@@ -2031,6 +2030,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2063,6 +2062,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
return this.lastClimbablePos;
}

6
patches/server/0033-Improve-container-checking-with-a-bitset.patch
View File

@@ -415,7 +415,7 @@ index b88aa184cd06a0485146f58a5b61a56a50911209..bf7ec7196d02553bc26caf87213fa241
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index 8310d132006043e93c612890514c4c7f3eb1c74d..55a5fad40f39b467ba933b2e0778998a54dbb8b2 100644
index 53f9d28bf3c6aafd4fdd6c12e0285500fe7350ce..415ad627084c35b4c022cff3ce782e2265a78759 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -488,7 +488,7 @@ index 8310d132006043e93c612890514c4c7f3eb1c74d..55a5fad40f39b467ba933b2e0778998a
if (!item.isEmpty()) {
foundItem = true;
ItemStack origItemStack = item;
@@ -723,7 +749,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -725,7 +751,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) {
boolean flag = false;
@@ -497,7 +497,7 @@ index 8310d132006043e93c612890514c4c7f3eb1c74d..55a5fad40f39b467ba933b2e0778998a
if (itemstack1.isEmpty()) {
// Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
@@ -911,7 +937,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -913,7 +939,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@Override
protected void setItems(NonNullList<ItemStack> inventory) {

4
patches/server/0046-Reduce-in-wall-checks.patch
View File

@@ -28,7 +28,7 @@ but is so much cheaper than the suffocation check that it's worth
keeping it.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index daa8c9019bcd7062508444f1bd6e04bfb7daeb7b..b06766a45138e40022e4131832c8d6288e7f6c48 100644
index 8b42a46cc48e7d4c8fac84f85ed89517e77bf920..e8d413ad5eeb3c8be38f2ddc3e69b69060aee7c3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -447,7 +447,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -43,7 +43,7 @@ index daa8c9019bcd7062508444f1bd6e04bfb7daeb7b..b06766a45138e40022e4131832c8d628
this.hurt(this.damageSources().inWall(), 1.0F);
} else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone();
@@ -1405,6 +1408,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1406,6 +1409,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
return this.getHealth() <= 0.0F;
}

6
patches/server/0050-Reduce-hopper-item-checks.patch
View File

@@ -120,7 +120,7 @@ index 5f042e294db605827000123252b0df646968f897..e1cc15f28fe8da23b74ff4504c5b2da2
double getLevelY();
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index 55a5fad40f39b467ba933b2e0778998a54dbb8b2..21a1a880d49db917528d919ef7dd5cabbc8e2568 100644
index 415ad627084c35b4c022cff3ce782e2265a78759..a7c7065d3b2016f6e2720e8cd8a0f47ddf7c30e6 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -11,6 +11,7 @@ import net.minecraft.core.NonNullList;
@@ -139,7 +139,7 @@ index 55a5fad40f39b467ba933b2e0778998a54dbb8b2..21a1a880d49db917528d919ef7dd5cab
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.HopperMenu;
import net.minecraft.world.item.ItemStack;
@@ -589,7 +591,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -590,7 +592,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
} else {
boolean flag = hopper.isGridAligned() && iblockdata.isCollisionShapeFullBlock(world, blockposition) && !iblockdata.is(BlockTags.DOES_NOT_BLOCK_HOPPERS);
@@ -148,7 +148,7 @@ index 55a5fad40f39b467ba933b2e0778998a54dbb8b2..21a1a880d49db917528d919ef7dd5cab
Iterator iterator = HopperBlockEntity.getItemsAtAndAbove(world, hopper).iterator();
while (iterator.hasNext()) {
@@ -898,6 +900,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -900,6 +902,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
return first.getCount() < first.getMaxStackSize() && ItemStack.isSameItemSameComponents(first, second); // Paper - Perf: Optimize Hoppers; used to return true for full itemstacks?!
}

4
patches/server/0072-Fix-MC-31819.patch
View File

@@ -19,10 +19,10 @@ the displayed hunger bar never goes down. Hunger (or any related value, includin
should not go down on peaceful. See https://bugs.mojang.com/browse/MC-31819.
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 54ba25632c2a9e1c93a5b3a0b92e5280864c49d6..368221efa2a3b97058f146387dd4e91a59250bd8 100644
index 09bcbc0ae36e4e69fee87a7e0c49acf496117a39..81fdab6a5fbc39cb942f7b07a132a8f1ef18cb37 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1904,6 +1904,11 @@ public abstract class Player extends LivingEntity {
@@ -1907,6 +1907,11 @@ public abstract class Player extends LivingEntity {
}
public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {

4
patches/server/0076-Reduce-array-allocations.patch
View File

@@ -485,10 +485,10 @@ index f5e79db3ccde0730c3b4fb81c76ca6ed045a7374..5546a873fae5252df5fb4bf8781e70db
private EquipmentSlotGroup(final int id, final String name, final Predicate<EquipmentSlot> slotPredicate) {
this.id = id;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b06766a45138e40022e4131832c8d6288e7f6c48..6ae8d4f50c6a4beab511ab9fdf540fb7a3ddd5d3 100644
index e8d413ad5eeb3c8be38f2ddc3e69b69060aee7c3..6ceafcb6b40496b4e5733fab9a49f4f01240a7ce 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3225,7 +3225,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3275,7 +3275,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Nullable
private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
Map<EquipmentSlot, ItemStack> map = null;

4
patches/server/0102-Spread-out-sending-all-player-info.patch
View File

@@ -157,7 +157,7 @@ index aabca85eb35085511b24ace968d3bf1b85303445..d77e3502ce709166126047da1f63d229
}
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 368221efa2a3b97058f146387dd4e91a59250bd8..f6faf01c766a72066ceac627ce7999fe3dc05a2c 100644
index 81fdab6a5fbc39cb942f7b07a132a8f1ef18cb37..a3051cafbab789d1ca8c9af2f3486d77a1c5470b 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -39,6 +39,7 @@ import net.minecraft.network.syncher.SynchedEntityData;
@@ -168,7 +168,7 @@ index 368221efa2a3b97058f146387dd4e91a59250bd8..f6faf01c766a72066ceac627ce7999fe
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
@@ -207,12 +208,15 @@ public abstract class Player extends LivingEntity {
@@ -208,12 +209,15 @@ public abstract class Player extends LivingEntity {
}
// CraftBukkit end

6
patches/server/0104-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 05745c9d55cb36fb09eb06f9412bf935f59fc3d0..fd621d311c5ac438e63a6f1d58073a53f9710e11 100644
index 09a973aa95d96924303c7e55521b9f20cbc036a0..bb795990efbcc077bf47f9814281b691e7e9b920 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -511,6 +511,7 @@ public class Commands {
@@ -508,6 +508,7 @@ public class Commands {
private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
// Paper end - Perf: Async command map building
new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, true).callEvent(); // Paper - Brigadier API
@@ -48,7 +48,7 @@ index 05745c9d55cb36fb09eb06f9412bf935f59fc3d0..fd621d311c5ac438e63a6f1d58073a53
PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
event.getPlayer().getServer().getPluginManager().callEvent(event);
@@ -521,6 +522,7 @@ public class Commands {
@@ -518,6 +519,7 @@ public class Commands {
}
}
// CraftBukkit end

4
patches/server/0109-Don-t-load-chunks-to-activate-climbing-entities.patch
View File

@@ -28,10 +28,10 @@ index 47f94388024f1618549d9cafa6a8c2bb24d7279d..d0599a0a41d4bfc1a2063ef4228402da
return this.chunkPosition;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 6b1b16c0ade335058834c01d9d760ef0a76928ca..15ba997a722530a5461d3a66b9fbed26b5312a37 100644
index 3b5fdc6eb0baac06b103e8fe45eeb18635da9544..7fe4642258ede9cb9cbc09be78a750edb47d0761 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2047,19 +2047,43 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2079,19 +2079,43 @@ public abstract class LivingEntity extends Entity implements Attackable {
public boolean onClimbableCached() {
if (!this.blockPosition().equals(this.lastClimbingPosition)) {

4
patches/server/0110-Broadcast-crit-animations-as-the-entity-being-critte.patch
View File

@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 79b49aec7c5c80948b8f1c77ca6e48049dae174e..a70317f5b5cf0fc5ab80782e6f22e76d3716b749 100644
index d18c3c20b556fbf5146eb7cc614cc1b0e442d52e..705890ab08f97158faaccadbaf7e534666ce86ff 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2148,12 +2148,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -2150,12 +2150,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@Override
public void crit(Entity target) {

6
patches/server/0122-Increase-time-statistics-in-intervals.patch
View File

@@ -45,7 +45,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index f6faf01c766a72066ceac627ce7999fe3dc05a2c..4f36d5b8d00d260ad1e03274393a7afd5afed45b 100644
index a3051cafbab789d1ca8c9af2f3486d77a1c5470b..156fdf06737afa40874a25313cf49b1bff30b50b 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -114,6 +114,7 @@ import net.minecraft.world.phys.AABB;
@@ -56,7 +56,7 @@ index f6faf01c766a72066ceac627ce7999fe3dc05a2c..4f36d5b8d00d260ad1e03274393a7afd
import org.slf4j.Logger;
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -156,6 +157,7 @@ public abstract class Player extends LivingEntity {
@@ -157,6 +158,7 @@ public abstract class Player extends LivingEntity {
protected static final EntityDataAccessor<Byte> DATA_PLAYER_MAIN_HAND = SynchedEntityData.defineId(Player.class, EntityDataSerializers.BYTE);
protected static final EntityDataAccessor<CompoundTag> DATA_SHOULDER_LEFT = SynchedEntityData.defineId(Player.class, EntityDataSerializers.COMPOUND_TAG);
protected static final EntityDataAccessor<CompoundTag> DATA_SHOULDER_RIGHT = SynchedEntityData.defineId(Player.class, EntityDataSerializers.COMPOUND_TAG);
@@ -64,7 +64,7 @@ index f6faf01c766a72066ceac627ce7999fe3dc05a2c..4f36d5b8d00d260ad1e03274393a7afd
private long timeEntitySatOnShoulder;
final Inventory inventory = new Inventory(this);
protected PlayerEnderChestContainer enderChestInventory = new PlayerEnderChestContainer(this); // CraftBukkit - add "this" to constructor
@@ -297,19 +299,23 @@ public abstract class Player extends LivingEntity {
@@ -298,19 +300,23 @@ public abstract class Player extends LivingEntity {
this.moveCloak();
if (!this.level().isClientSide) {
this.foodData.tick(this);

4
patches/server/0130-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
View File

@@ -18,10 +18,10 @@ this patch is focused around the sensors used for ai
delete the line of sight cache less often and use a faster nearby comparison
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 15ba997a722530a5461d3a66b9fbed26b5312a37..3c13810d03bf1c343195b9366554a046ff6112da 100644
index 7fe4642258ede9cb9cbc09be78a750edb47d0761..0dc93599a89c58dba6116a2a9f7f0d7f6ed93fbb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1029,10 +1029,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1030,10 +1030,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
if (entity != null) {