Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-19 14:59:29 +00:00
Code Issues Releases Activity

Set Gale permissions root

Browse Source
This commit is contained in:
MartijnMuijsers
2022-11-25 18:43:23 +01:00
parent 28242d212e
commit ad4ef24b49
46 changed files with 78 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0004-Set-Gale-permissions-root.patch Normal file
View File

@@ -0,0 +1,18 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MartijnMuijsers <martijnmuijsers@live.nl>
Date: Fri, 25 Nov 2022 18:42:45 +0100
Subject: [PATCH] Set Gale permissions root
diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
index 8e06bc11fb28baee3407bbfe9d7b3689d6f85ff2..31a8161967139d1576a9c47f11d875adbd896f3d 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
@@ -5,6 +5,7 @@ import org.bukkit.util.permissions.DefaultPermissions;
public final class CraftDefaultPermissions {
private static final String ROOT = "minecraft";
+ public static final String GALE_ROOT = "gale";
private CraftDefaultPermissions() {}

2
patches/server/0004-Recommend-disabling-timings-on-startup.patch → patches/server/0005-Recommend-disabling-timings-on-startup.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..d66b0d5f77b273af053e3471af4ef18956ba85ff 100644 index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..068ff7593dcf0ca1cd2b01a112dd15a7a43d9613 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -7,6 +7,7 @@ import net.kyori.adventure.text.Component; @@ -7,6 +7,7 @@ import net.kyori.adventure.text.Component;

6
patches/server/0005-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch → patches/server/0006-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
View File

@@ -39,7 +39,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/>. 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 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3bfa0c6a0d82ed980b3289051892a6d1745ebb69..4eb6d1536cdc105aacf7507b69b7ac16a2dbd78a 100644 index 3bfa0c6a0d82ed980b3289051892a6d1745ebb69..8c5b2eed391aabccdc720ab253d1b13c6c1fdfff 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3607,7 +3607,7 @@ public abstract class LivingEntity extends Entity { @@ -3607,7 +3607,7 @@ public abstract class LivingEntity extends Entity {
@@ -52,7 +52,7 @@ index 3bfa0c6a0d82ed980b3289051892a6d1745ebb69..4eb6d1536cdc105aacf7507b69b7ac16
} }
diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
index d1eefa6ef3e9abfe7af4d8310aa64465fa2d5463..413f5cc82e94a6308279be618d8ed1438b3bfb9d 100644 index d1eefa6ef3e9abfe7af4d8310aa64465fa2d5463..c970be55461f3063ec22ec0490781b974db134f6 100644
--- a/src/main/java/net/minecraft/world/level/BlockGetter.java --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
+++ b/src/main/java/net/minecraft/world/level/BlockGetter.java +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
@@ -73,6 +73,16 @@ public interface BlockGetter extends LevelHeightAccessor { @@ -73,6 +73,16 @@ public interface BlockGetter extends LevelHeightAccessor {
@@ -73,7 +73,7 @@ index d1eefa6ef3e9abfe7af4d8310aa64465fa2d5463..413f5cc82e94a6308279be618d8ed143
default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) { default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
// Paper start - Prevent raytrace from loading chunks // Paper start - Prevent raytrace from loading chunks
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index ed65805906a6e1e03c2d96b76bba749a9dfd27be..bf82deab0fb527cfc7f480f8db7801fa066c4e4e 100644 index 756e0ef8fa2226812c3322d1fe605c60132b01df..fbc55bb3bbde16a70bce38cb73f69867dce44a98 100644
--- a/src/main/java/net/minecraft/world/level/Level.java --- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -407,6 +407,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -407,6 +407,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

4
patches/server/0006-Simpler-ShapelessRecipe-comparison-for-vanilla.patch → patches/server/0007-Simpler-ShapelessRecipe-comparison-for-vanilla.patch
View File

@@ -36,7 +36,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
index ffe5476d8ed15ee4384b679c341688787205ce59..367ed0c8fba3ed4672970f6042db393a3eda6560 100644 index ffe5476d8ed15ee4384b679c341688787205ce59..283aa4fe50c25ea272de2d7ec3826cd913b4c661 100644
--- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java --- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
+++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java +++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
@@ -25,8 +25,14 @@ public class ShapelessRecipe implements CraftingRecipe { @@ -25,8 +25,14 @@ public class ShapelessRecipe implements CraftingRecipe {
@@ -84,7 +84,7 @@ index ffe5476d8ed15ee4384b679c341688787205ce59..367ed0c8fba3ed4672970f6042db393a
int i = 0; int i = 0;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
index 0b3b46348ac9195bff1492ffc11fcbff7d3f5c6f..ec46ccb2bcc697461e433d265eb593d3360dd469 100644 index 0b3b46348ac9195bff1492ffc11fcbff7d3f5c6f..a7ecaae493b937d764fcecb78b182cf36ea92afa 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
@@ -43,6 +43,6 @@ public class CraftShapelessRecipe extends ShapelessRecipe implements CraftRecipe @@ -43,6 +43,6 @@ public class CraftShapelessRecipe extends ShapelessRecipe implements CraftRecipe

4
patches/server/0007-Reduce-projectile-chunk-loading.patch → patches/server/0008-Reduce-projectile-chunk-loading.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
index 713c11d6547cb02ac4b6a02aec07a8ba68019f3f..d6b714ef427052bc9378567542c9f0b56de58b6c 100644 index 713c11d6547cb02ac4b6a02aec07a8ba68019f3f..2c6efa6503eee64cb33a100afb692b79bba67f68 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -42,6 +42,44 @@ public abstract class Projectile extends Entity { @@ -42,6 +42,44 @@ public abstract class Projectile extends Entity {
@@ -79,7 +79,7 @@ index 713c11d6547cb02ac4b6a02aec07a8ba68019f3f..d6b714ef427052bc9378567542c9f0b5
if (entity != null) { if (entity != null) {
this.ownerUUID = entity.getUUID(); this.ownerUUID = entity.getUUID();
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index b2113c0ad2a7e6e19b3b981428cfc6f9df8423ac..fa513614e32963fede05e05cacefbf31010d0c07 100644 index b82bb95b524c95cdefb81abef906eded0717e9a1..3e2e442fea6ba6fa5b0eabef724478a62bf460a0 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -33,7 +33,55 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -33,7 +33,55 @@ public class GaleWorldConfiguration extends ConfigurationPart {

4
patches/server/0008-Reduce-spooky-season-checks.patch → patches/server/0009-Reduce-spooky-season-checks.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
index def01d221f36d71640bf4ef982a984909aacc6da..e7147ee37139c9e823787f1f815fc0aee8da4f59 100644 index def01d221f36d71640bf4ef982a984909aacc6da..2180277e77311a0bf087186d3fca8f67052af121 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -28,6 +28,7 @@ import net.minecraft.world.level.LevelAccessor; @@ -28,6 +28,7 @@ import net.minecraft.world.level.LevelAccessor;
@@ -69,7 +69,7 @@ index def01d221f36d71640bf4ef982a984909aacc6da..e7147ee37139c9e823787f1f815fc0ae
@Override @Override
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 83b804746cce3660f4e3d1027375b052d4d7f59a..1ed2275e3e630c1f0dfa29676a239a4af8264332 100644 index 8f8fd98f96cd390ba43033521982a13044df91cf..af4883f8939d017866a9b057491a8400b11fe009 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -23,7 +23,23 @@ public class GaleGlobalConfiguration extends ConfigurationPart { @@ -23,7 +23,23 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

4
patches/server/0009-Move-random-tick-random.patch → patches/server/0010-Move-random-tick-random.patch
View File

@@ -18,7 +18,7 @@ require it to be initialized earlier. By moving it to the superclass, we
initialize it earlier, ensuring that it is available sooner. initialize it earlier, ensuring that it is available sooner.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 73e5a7893c49d488525ed53ca09e91d8f90cc7bd..c6e56abd3e62a93320bc11e9ae8f94e1e83a6956 100644 index 4b7058dc684d15a782455dd52a4d57e21ba18592..f7214b2a9bc8e8514477f1434a829a82da1e50d6 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -792,7 +792,6 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -792,7 +792,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -30,7 +30,7 @@ index 73e5a7893c49d488525ed53ca09e91d8f90cc7bd..c6e56abd3e62a93320bc11e9ae8f94e1
public void tickChunk(LevelChunk chunk, int randomTickSpeed) { public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index bf82deab0fb527cfc7f480f8db7801fa066c4e4e..7c782e642b7489981d55012d16d9107ae6a0be03 100644 index fbc55bb3bbde16a70bce38cb73f69867dce44a98..76a6e5d1230e2f68f7ff9c0e3f54762050f24f03 100644
--- a/src/main/java/net/minecraft/world/level/Level.java --- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -180,6 +180,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -180,6 +180,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

6
patches/server/0010-Optimize-random-calls-in-chunk-ticking.patch → patches/server/0011-Optimize-random-calls-in-chunk-ticking.patch
View File

@@ -51,7 +51,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 4ff563d903633f181e1268daa77f250cfec204a0..41d3dae2ddfa32d9d77566f27e1292c5152f94cc 100644 index 4ff563d903633f181e1268daa77f250cfec204a0..4654995f9982e77abe4b825b32312c2913671cd4 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -702,6 +702,7 @@ public class ServerChunkCache extends ChunkSource { @@ -702,6 +702,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -63,7 +63,7 @@ index 4ff563d903633f181e1268daa77f250cfec204a0..41d3dae2ddfa32d9d77566f27e1292c5
boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index c6e56abd3e62a93320bc11e9ae8f94e1e83a6956..69fffb33ca1398892732fccd376c22cd0ce03f0a 100644 index f7214b2a9bc8e8514477f1434a829a82da1e50d6..a336ab0e88001fc1846b9172c16ca6f6043f98d5 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -794,6 +794,8 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -794,6 +794,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -94,7 +94,7 @@ index c6e56abd3e62a93320bc11e9ae8f94e1e83a6956..69fffb33ca1398892732fccd376c22cd
this.getRandomBlockPosition(j, 0, k, 15, blockposition); this.getRandomBlockPosition(j, 0, k, 15, blockposition);
int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1; int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 5e54cf312160e537d2fe6e6fedc618160359330e..f840a350b06d86a17e5a3de3c6f09bda91225268 100644 index 5e54cf312160e537d2fe6e6fedc618160359330e..e4da6ac80c0cef156d9c8e1ca77be42033622646 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -88,6 +88,18 @@ public class LevelChunk extends ChunkAccess { @@ -88,6 +88,18 @@ public class LevelChunk extends ChunkAccess {

2
patches/server/0011-Reduce-enderman-teleport-chunk-lookups.patch → patches/server/0012-Reduce-enderman-teleport-chunk-lookups.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index f22e615dba31619c97bf58930da060476a52facf..cc9c5737519ccc6d534d0a43053e2a6f3823a8be 100644 index f22e615dba31619c97bf58930da060476a52facf..f9b34853c8c37bf622f30c40b795929c05aac725 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -317,11 +317,17 @@ public class EnderMan extends Monster implements NeutralMob { @@ -317,11 +317,17 @@ public class EnderMan extends Monster implements NeutralMob {

4
patches/server/0012-Reduce-acquire-POI-for-stuck-entities.patch → patches/server/0013-Reduce-acquire-POI-for-stuck-entities.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
index 43243537b765a2d270be6de3f053fea77ff67d18..b7013df56364a4503bfc9e56533cb1fcef49f4c6 100644 index 43243537b765a2d270be6de3f053fea77ff67d18..ea6424d5e70470ffdcff689b58688cf665c940b2 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
@@ -65,7 +65,10 @@ public class AcquirePoi extends Behavior<PathfinderMob> { @@ -65,7 +65,10 @@ public class AcquirePoi extends Behavior<PathfinderMob> {
@@ -46,7 +46,7 @@ index 43243537b765a2d270be6de3f053fea77ff67d18..b7013df56364a4503bfc9e56533cb1fc
} }
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index fa513614e32963fede05e05cacefbf31010d0c07..a277e64b3bcfe3add3d3652b65255c8c91cdbdd8 100644 index 3e2e442fea6ba6fa5b0eabef724478a62bf460a0..a80748f108c4973e1a3df7e0ff0e11160c91adb9 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -83,6 +83,26 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -83,6 +83,26 @@ public class GaleWorldConfiguration extends ConfigurationPart {

2
patches/server/0013-Remove-iterators-from-Inventory-contains.patch → patches/server/0014-Remove-iterators-from-Inventory-contains.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java
index a1a625a8dacf4d2bbf75ddd90dce1b1be663c919..e1bd7984d08f43ba6646e4223fce9201178c174d 100644 index a1a625a8dacf4d2bbf75ddd90dce1b1be663c919..1147eab33e1570f53ecc8e59218e96598535f501 100644
--- a/src/main/java/net/minecraft/world/entity/player/Inventory.java --- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
+++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java +++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
@@ -681,6 +681,8 @@ public class Inventory implements Container, Nameable { @@ -681,6 +681,8 @@ public class Inventory implements Container, Nameable {

2
patches/server/0014-Check-targeting-range-before-getting-visibility.patch → patches/server/0015-Check-targeting-range-before-getting-visibility.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
index a7575b5ef56af6f53448d391abb4956e130148ca..14a66220f2a88a292ea6acc3bd57ea32e7bf372b 100644 index a7575b5ef56af6f53448d391abb4956e130148ca..58c3b8e622941108e46bb1b4e9eb9497d6553ab4 100644
--- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java --- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
+++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java +++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
@@ -75,9 +75,18 @@ public class TargetingConditions { @@ -75,9 +75,18 @@ public class TargetingConditions {

2
patches/server/0015-Print-stack-trace-for-plugins-not-shutting-down-task.patch → patches/server/0016-Print-stack-trace-for-plugins-not-shutting-down-task.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4ccd6640bf0125d5b6734ef0de993e675fd9d45a..ebd0abcb6c7c04d18b6be254d4bb1224945a4ffc 100644 index f63cadbecb126e58ededb61e87e600b7701df57b..874f17fd7e3ff945eeccdf5e0b1991366240ea6b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1053,6 +1053,13 @@ public final class CraftServer implements Server { @@ -1053,6 +1053,13 @@ public final class CraftServer implements Server {

4
patches/server/0016-Improve-fluid-direction-caching.patch → patches/server/0017-Improve-fluid-direction-caching.patch
View File

@@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/gg/airplane/structs/FluidDirectionCache.java b/src/main/java/gg/airplane/structs/FluidDirectionCache.java diff --git a/src/main/java/gg/airplane/structs/FluidDirectionCache.java b/src/main/java/gg/airplane/structs/FluidDirectionCache.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..3a405aabeec696fad5ccebb921da374836fb1201 index 0000000000000000000000000000000000000000..bf6a36c933b686f0e34591dff3d43b3797c29b2b
--- /dev/null --- /dev/null
+++ b/src/main/java/gg/airplane/structs/FluidDirectionCache.java +++ b/src/main/java/gg/airplane/structs/FluidDirectionCache.java
@@ -0,0 +1,143 @@ @@ -0,0 +1,143 @@
@@ -185,7 +185,7 @@ index 0000000000000000000000000000000000000000..3a405aabeec696fad5ccebb921da3748
+ } + }
+} +}
diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
index ff40fe323964f173561a6838fb443e79abf9df38..38edb592998f04d3b862f2af44755f47b3b82ae5 100644 index ff40fe323964f173561a6838fb443e79abf9df38..91ba64113f8fba4e0ada8b10d379243ae8c03327 100644
--- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java --- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
+++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java +++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
@@ -43,6 +43,8 @@ public abstract class FlowingFluid extends Fluid { @@ -43,6 +43,8 @@ public abstract class FlowingFluid extends Fluid {

4
patches/server/0017-Cache-on-climbable-check.patch → patches/server/0018-Cache-on-climbable-check.patch
View File

@@ -30,7 +30,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/>. 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 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 4eb6d1536cdc105aacf7507b69b7ac16a2dbd78a..842f12ad6106eaa9a5bde69d3702abcac4d347b1 100644 index 8c5b2eed391aabccdc720ab253d1b13c6c1fdfff..e1614462ba2f186db2b9febcc86afc270754199c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1906,6 +1906,20 @@ public abstract class LivingEntity extends Entity { @@ -1906,6 +1906,20 @@ public abstract class LivingEntity extends Entity {
@@ -55,7 +55,7 @@ index 4eb6d1536cdc105aacf7507b69b7ac16a2dbd78a..842f12ad6106eaa9a5bde69d3702abca
if (this.isSpectator()) { if (this.isSpectator()) {
return false; return false;
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 1b42c98956342832c37f0aa266f85271daa4ba5b..c9da41176d03c572b83d18f160b873c732686bd2 100644 index 1b42c98956342832c37f0aa266f85271daa4ba5b..ad1187d2a513dbfd624d15b0663e07c70dc72f3a 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -291,7 +291,7 @@ public class ActivationRange @@ -291,7 +291,7 @@ public class ActivationRange

6
patches/server/0018-Config-to-disable-vanilla-profiler.patch → patches/server/0019-Config-to-disable-vanilla-profiler.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index afd22d4446b29e83fea9c84b97ef96798d7e6895..da83060f671bee830ea65fe4e4303d22c1c5fa99 100644 index 121495135676a7de4d1e6b06cb6c77e5523a2b0d..134c8b2acfaa2a8d7cd9a26a85ee4d0227f1a2cd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -149,6 +149,7 @@ import net.minecraft.world.phys.Vec2; @@ -149,6 +149,7 @@ import net.minecraft.world.phys.Vec2;
@@ -54,7 +54,7 @@ index afd22d4446b29e83fea9c84b97ef96798d7e6895..da83060f671bee830ea65fe4e4303d22
} }
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 7c782e642b7489981d55012d16d9107ae6a0be03..4c38c9d6eef8186bd4b1725520047cd7ee78ce28 100644 index 76a6e5d1230e2f68f7ff9c0e3f54762050f24f03..3e4f2b6a5c269df2bb64f879dd75731c2af227e7 100644
--- a/src/main/java/net/minecraft/world/level/Level.java --- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -92,6 +92,7 @@ import org.bukkit.craftbukkit.block.data.CraftBlockData; @@ -92,6 +92,7 @@ import org.bukkit.craftbukkit.block.data.CraftBlockData;
@@ -78,7 +78,7 @@ index 7c782e642b7489981d55012d16d9107ae6a0be03..4c38c9d6eef8186bd4b1725520047cd7
} }
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 1ed2275e3e630c1f0dfa29676a239a4af8264332..5bb57e160b446d96147fe1f8b2cfa8e26eb8e651 100644 index af4883f8939d017866a9b057491a8400b11fe009..5bf0c4d9cf136cd19d87ee04a834413240eec339 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -41,6 +41,8 @@ public class GaleGlobalConfiguration extends ConfigurationPart { @@ -41,6 +41,8 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

2
patches/server/0019-Use-array-for-gamerule-storage.patch → patches/server/0020-Use-array-for-gamerule-storage.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
index 2c500cfdd594e24b039d698bced1f9f9537722e3..9409c5d501e60b828b65b4eaef79af2a3ef3fc2b 100644 index 2c500cfdd594e24b039d698bced1f9f9537722e3..e660a84251bc67435e905aacf628a84156b5d689 100644
--- a/src/main/java/net/minecraft/world/level/GameRules.java --- a/src/main/java/net/minecraft/world/level/GameRules.java
+++ b/src/main/java/net/minecraft/world/level/GameRules.java +++ b/src/main/java/net/minecraft/world/level/GameRules.java
@@ -91,6 +91,7 @@ public class GameRules { @@ -91,6 +91,7 @@ public class GameRules {

2
patches/server/0020-Make-EntityCollisionContext-a-live-representation.patch → patches/server/0021-Make-EntityCollisionContext-a-live-representation.patch
View File

@@ -39,7 +39,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java diff --git a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
index ebe65474a4a05ff1637d7f37ebcfe690af59def5..ec0151ae2a8779d8380efcbb554d3961f5df42bf 100644 index ebe65474a4a05ff1637d7f37ebcfe690af59def5..1bf730336e23eef97d22de7613c63bb9ea0c427c 100644
--- a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java --- a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
+++ b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java +++ b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
@@ -19,47 +19,72 @@ public class EntityCollisionContext implements CollisionContext { @@ -19,47 +19,72 @@ public class EntityCollisionContext implements CollisionContext {

14
patches/server/0021-Improve-container-checking-with-a-bitset.patch → patches/server/0022-Improve-container-checking-with-a-bitset.patch
View File

@@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/gg/airplane/structs/ItemListWithBitset.java b/src/main/java/gg/airplane/structs/ItemListWithBitset.java diff --git a/src/main/java/gg/airplane/structs/ItemListWithBitset.java b/src/main/java/gg/airplane/structs/ItemListWithBitset.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..193a58189e7173131e2c23780043adf9d4726fa3 index 0000000000000000000000000000000000000000..a45b135af87324c99a9fdd6ba9564255e5beb199
--- /dev/null --- /dev/null
+++ b/src/main/java/gg/airplane/structs/ItemListWithBitset.java +++ b/src/main/java/gg/airplane/structs/ItemListWithBitset.java
@@ -0,0 +1,116 @@ @@ -0,0 +1,116 @@
@@ -152,7 +152,7 @@ index 0000000000000000000000000000000000000000..193a58189e7173131e2c23780043adf9
+ } + }
+} +}
diff --git a/src/main/java/net/minecraft/world/CompoundContainer.java b/src/main/java/net/minecraft/world/CompoundContainer.java diff --git a/src/main/java/net/minecraft/world/CompoundContainer.java b/src/main/java/net/minecraft/world/CompoundContainer.java
index 241fec02e6869c638d3a160819b32173a081467b..d245210d0b01449894018717bc984fa577fc62ec 100644 index 241fec02e6869c638d3a160819b32173a081467b..1380f521de979b8734ebd13dd420b312db15dc04 100644
--- a/src/main/java/net/minecraft/world/CompoundContainer.java --- a/src/main/java/net/minecraft/world/CompoundContainer.java
+++ b/src/main/java/net/minecraft/world/CompoundContainer.java +++ b/src/main/java/net/minecraft/world/CompoundContainer.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@@ -187,7 +187,7 @@ index 241fec02e6869c638d3a160819b32173a081467b..d245210d0b01449894018717bc984fa5
public int getContainerSize() { public int getContainerSize() {
return this.container1.getContainerSize() + this.container2.getContainerSize(); return this.container1.getContainerSize() + this.container2.getContainerSize();
diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..1e7dba1ca2fd270a7c362e3113f1a0060d835ee0 100644 index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..f5bed0f18b2a3dbe7d52c1b83717298fa5acf561 100644
--- a/src/main/java/net/minecraft/world/Container.java --- a/src/main/java/net/minecraft/world/Container.java
+++ b/src/main/java/net/minecraft/world/Container.java +++ b/src/main/java/net/minecraft/world/Container.java
@@ -2,6 +2,8 @@ package net.minecraft.world; @@ -2,6 +2,8 @@ package net.minecraft.world;
@@ -264,7 +264,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..1e7dba1ca2fd270a7c362e3113f1a006
int LARGE_MAX_STACK_SIZE = 64; int LARGE_MAX_STACK_SIZE = 64;
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
index b8fb7b5a347298ada16bc8b818edf1863e3f6040..b2c1e7f9d2132ee830d3e44941291bc7863cc1c4 100644 index b8fb7b5a347298ada16bc8b818edf1863e3f6040..8de3aa9dae051ef12dc59e761ea8fcaf497bb01e 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
@@ -27,7 +27,10 @@ import org.bukkit.inventory.InventoryHolder; @@ -27,7 +27,10 @@ import org.bukkit.inventory.InventoryHolder;
@@ -311,7 +311,7 @@ index b8fb7b5a347298ada16bc8b818edf1863e3f6040..b2c1e7f9d2132ee830d3e44941291bc7
} }
diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
index a71414397bd45ee7bcacfeef0041d80dfa25f114..045325103597f91e257799ea567cc26ae9b66bd5 100644 index a71414397bd45ee7bcacfeef0041d80dfa25f114..7743f185672e977520218c3ce6b8ddc948dfc08e 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java --- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
@@ -31,7 +31,10 @@ import org.bukkit.entity.HumanEntity; @@ -31,7 +31,10 @@ import org.bukkit.entity.HumanEntity;
@@ -389,7 +389,7 @@ index a71414397bd45ee7bcacfeef0041d80dfa25f114..045325103597f91e257799ea567cc26a
@Override @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 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 ccad692aba2ed77259f6814d88f01b91ed9d229b..28e864885be7af3eaefae709fa6c390b6ce483d8 100644 index ccad692aba2ed77259f6814d88f01b91ed9d229b..877e07c62a6235670c756edef3eebb385bccccd4 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -43,7 +43,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @@ -43,7 +43,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -504,7 +504,7 @@ index ccad692aba2ed77259f6814d88f01b91ed9d229b..28e864885be7af3eaefae709fa6c390b
public static void entityInside(Level world, BlockPos pos, BlockState state, Entity entity, HopperBlockEntity blockEntity) { public static void entityInside(Level world, BlockPos pos, BlockState state, Entity entity, HopperBlockEntity blockEntity) {
diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
index d559f93a9a09bac414dd5d58afccad42c127f09b..a25eb07c1209c935e4d97f24c820dc78742aca9d 100644 index d559f93a9a09bac414dd5d58afccad42c127f09b..2175ed0c05a92d89db1cdae6983674efc4a8be08 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
@@ -96,13 +96,8 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc @@ -96,13 +96,8 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc

2
patches/server/0022-Better-checking-for-useless-move-packets.patch → patches/server/0023-Better-checking-for-useless-move-packets.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 2358bb1788cfb902bac9b3b7588954af2d2cd823..b299c490882d51cfc5f268c15f40ae2b4a3552fc 100644 index 2358bb1788cfb902bac9b3b7588954af2d2cd823..1392c2e7487a2317496c48a013a745b02c8123d3 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -166,6 +166,7 @@ public class ServerEntity { @@ -166,6 +166,7 @@ public class ServerEntity {

2
patches/server/0023-Use-fast-item-merge-raytracing.patch → patches/server/0024-Use-fast-item-merge-raytracing.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index fcc5444a1268931a0fd2df1e6bbbc17cfd5a61e0..2e07ce1264680ae433a2da7ce90569368e74ab21 100644 index fcc5444a1268931a0fd2df1e6bbbc17cfd5a61e0..cab6cc8255704f89cca909f16c9c182d95700e4a 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -252,10 +252,16 @@ public class ItemEntity extends Entity { @@ -252,10 +252,16 @@ public class ItemEntity extends Entity {

4
patches/server/0024-Use-aging-cache-for-biome-temperatures.patch → patches/server/0025-Use-aging-cache-for-biome-temperatures.patch
View File

@@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/gg/airplane/structs/Long2FloatAgingCache.java b/src/main/java/gg/airplane/structs/Long2FloatAgingCache.java diff --git a/src/main/java/gg/airplane/structs/Long2FloatAgingCache.java b/src/main/java/gg/airplane/structs/Long2FloatAgingCache.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..e7cb935e96fa69db8b6dfc0273a2a59cdaad2dea index 0000000000000000000000000000000000000000..f3835d6934f4d82980eb068c0b8c238f9c4bae2f
--- /dev/null --- /dev/null
+++ b/src/main/java/gg/airplane/structs/Long2FloatAgingCache.java +++ b/src/main/java/gg/airplane/structs/Long2FloatAgingCache.java
@@ -0,0 +1,121 @@ @@ -0,0 +1,121 @@
@@ -157,7 +157,7 @@ index 0000000000000000000000000000000000000000..e7cb935e96fa69db8b6dfc0273a2a59c
+ } + }
+} +}
diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
index ca259e278ad10347567c021376abca0287610432..3c73e260e77150e6870389a1dbeb07595ba7fcc3 100644 index ca259e278ad10347567c021376abca0287610432..0a5ea1619fcd315987ac7998202c9e9e3b7e1fd0 100644
--- a/src/main/java/net/minecraft/world/level/biome/Biome.java --- a/src/main/java/net/minecraft/world/level/biome/Biome.java
+++ b/src/main/java/net/minecraft/world/level/biome/Biome.java +++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
@@ -66,14 +66,20 @@ public final class Biome { @@ -66,14 +66,20 @@ public final class Biome {

2
patches/server/0025-Inline-level-height.patch → patches/server/0026-Inline-level-height.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 4c38c9d6eef8186bd4b1725520047cd7ee78ce28..ee1c45e472c2c92490e076e65ee9213dd32be9fe 100644 index 3e4f2b6a5c269df2bb64f879dd75731c2af227e7..66b2cde3be8109a881095ee5758542b70af10c1a 100644
--- a/src/main/java/net/minecraft/world/level/Level.java --- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -272,6 +272,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -272,6 +272,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

2
patches/server/0026-Use-ThreadUnsafeRandom-for-mob-spawning.patch → patches/server/0027-Use-ThreadUnsafeRandom-for-mob-spawning.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 7c7408b9686c8ff945c30892d45914c60f6c5e4a..700408ed6f9109bd1cd56aeb0e46305d502ac862 100644 index 7c7408b9686c8ff945c30892d45914c60f6c5e4a..64065317ca2fc166db317402de9b9f8f88358721 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -415,13 +415,14 @@ public final class NaturalSpawner { @@ -415,13 +415,14 @@ public final class NaturalSpawner {

2
patches/server/0027-Remove-streams-and-iterators-from-range-check.patch → patches/server/0028-Remove-streams-and-iterators-from-range-check.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 55d8ced734a408c990c6c4fbc81707bcb1f27daa..472c9bc6d4702e91b6ee909459c5f82a57156fa5 100644 index 55d8ced734a408c990c6c4fbc81707bcb1f27daa..de844a1fefa9d4d0da6db105565cbb37f52de8c4 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1589,8 +1589,30 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -1589,8 +1589,30 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

2
patches/server/0028-Remove-streams-from-getting-nearby-players.patch → patches/server/0029-Remove-streams-from-getting-nearby-players.patch
View File

@@ -28,7 +28,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6fa47becd0f83ac4273ef3a10c314aa27b08184b..3f265ea03ac101aa6915f5013602cb60389c2257 100644 index 6fa47becd0f83ac4273ef3a10c314aa27b08184b..81ebee2362550c9193b70b4d2c3454f7b01c0e3e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -487,17 +487,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -487,17 +487,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

2
patches/server/0029-Skip-cloning-loot-parameters.patch → patches/server/0030-Skip-cloning-loot-parameters.patch
View File

@@ -37,7 +37,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java b/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java b/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java
index 35f9b11a3a61976c952a2c1c64bb2a932538f54f..27a07b15f85c8d0711654f0266236f4910daa4d2 100644 index 35f9b11a3a61976c952a2c1c64bb2a932538f54f..eb399244af70c8fe735657d429d883c48215af0a 100644
--- a/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java --- a/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java
+++ b/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java +++ b/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java
@@ -41,8 +41,10 @@ public class LootContext { @@ -41,8 +41,10 @@ public class LootContext {

2
patches/server/0030-Block-goal-does-not-load-chunks.patch → patches/server/0031-Block-goal-does-not-load-chunks.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
index 26bf383caea68834c654b25653ced9017f1b1b22..fd973375ad8c8f8dfd962b0b3484c81538649a5f 100644 index 26bf383caea68834c654b25653ced9017f1b1b22..6c67eef93e764ab7d339859d87d2e438b3b137fa 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java --- a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
@@ -119,6 +119,7 @@ public abstract class MoveToBlockGoal extends Goal { @@ -119,6 +119,7 @@ public abstract class MoveToBlockGoal extends Goal {

4
patches/server/0031-Reduce-entity-allocations.patch → patches/server/0032-Reduce-entity-allocations.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3f265ea03ac101aa6915f5013602cb60389c2257..2409c2ddfefc5d382c0d5edda63495e1ed723496 100644 index 81ebee2362550c9193b70b4d2c3454f7b01c0e3e..5a8d3cd8e3c1a4e901d321aab11698aed328b8bb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -413,6 +413,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -413,6 +413,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -42,7 +42,7 @@ index 3f265ea03ac101aa6915f5013602cb60389c2257..2409c2ddfefc5d382c0d5edda63495e1
return this.yRot; return this.yRot;
} }
diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
index 692524a69d43dcf52ae1b0f7f593fc53f3878137..f45af229cbd3d0f07a62d039691e370241e9c36c 100644 index 692524a69d43dcf52ae1b0f7f593fc53f3878137..81eb5e47715312afbedce0786e9a0d4264d32cbd 100644
--- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
@@ -22,9 +22,11 @@ public class AttributeMap { @@ -22,9 +22,11 @@ public class AttributeMap {

4
patches/server/0032-Remove-lambda-from-ticking-guard.patch → patches/server/0033-Remove-lambda-from-ticking-guard.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 69fffb33ca1398892732fccd376c22cd0ce03f0a..f1e5206a0bf3a10b8a471afa0aedb867eb848669 100644 index a336ab0e88001fc1846b9172c16ca6f6043f98d5..e7505144eba068e687f1ce7617f09d838bceab85 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -725,7 +725,20 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -725,7 +725,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -56,7 +56,7 @@ index 69fffb33ca1398892732fccd376c22cd0ce03f0a..f1e5206a0bf3a10b8a471afa0aedb867
} }
} }
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index ee1c45e472c2c92490e076e65ee9213dd32be9fe..7442e846076fa86065a10f17ee91df40204daa19 100644 index 66b2cde3be8109a881095ee5758542b70af10c1a..7fdd5f7d7a060309b9b44088836621ad1e512f1d 100644
--- a/src/main/java/net/minecraft/world/level/Level.java --- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -999,13 +999,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -999,13 +999,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

4
patches/server/0033-Reduce-entity-fluid-lookups-if-no-fluids.patch → patches/server/0034-Reduce-entity-fluid-lookups-if-no-fluids.patch
View File

@@ -30,7 +30,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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 2409c2ddfefc5d382c0d5edda63495e1ed723496..7ebff259973a1c920a04041c77bcfe457f960993 100644 index 5a8d3cd8e3c1a4e901d321aab11698aed328b8bb..99ded3ea60fa625f0a557d413dd1b063f827d10d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4043,16 +4043,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -4043,16 +4043,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -141,7 +141,7 @@ index 2409c2ddfefc5d382c0d5edda63495e1ed723496..7ebff259973a1c920a04041c77bcfe45
if (vec3d.length() > 0.0D) { if (vec3d.length() > 0.0D) {
if (k1 > 0) { if (k1 > 0) {
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
index b0c9fce9d4e06cac139e341d218d0b6aac1f1943..028defc43439258b102b780d1470e2e49e614ee0 100644 index b0c9fce9d4e06cac139e341d218d0b6aac1f1943..0ab7485f77c8d3bb0f5f16058027dc7b67965a64 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
@@ -27,6 +27,7 @@ public class LevelChunkSection { @@ -27,6 +27,7 @@ public class LevelChunkSection {

6
patches/server/0034-SIMD-support.patch → patches/server/0035-SIMD-support.patch
View File

@@ -12,7 +12,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 1a29eac414ad97c36fa92d65ea230b4f537492d1..69b35adc97166d540a583c1a467ee1651df873e7 100644 index 3103e811e1f41b782a5b95537b921c59cac2054f..6de2f2ebca9f4580f5f0463dbbacd11e157b44bf 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -55,7 +55,14 @@ dependencies { @@ -55,7 +55,14 @@ dependencies {
@@ -32,7 +32,7 @@ index 1a29eac414ad97c36fa92d65ea230b4f537492d1..69b35adc97166d540a583c1a467ee165
archiveClassifier.set("dev") archiveClassifier.set("dev")
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index acb9e2f67a5ffe46136e1687561630f96b27ce06..6dbd6d6339ef61db4eb961330e6a4df5a401f88b 100644 index 661794310eb10d4b9fe29c9445abd57826214d41..7d36f27c856fa28d844f8f12272862183583adf5 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -14,6 +14,8 @@ import java.util.Locale; @@ -14,6 +14,8 @@ import java.util.Locale;
@@ -75,7 +75,7 @@ index acb9e2f67a5ffe46136e1687561630f96b27ce06..6dbd6d6339ef61db4eb961330e6a4df5
this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd); this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 5bb57e160b446d96147fe1f8b2cfa8e26eb8e651..e9e9bfc76786525e0a6b41ba52776e93efc1ff65 100644 index 5bf0c4d9cf136cd19d87ee04a834413240eec339..a1d5197a5e7a00fad1025741ef8adcea45d42533 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -43,6 +43,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart { @@ -43,6 +43,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

4
patches/server/0035-Optimize-entity-coordinate-key.patch → patches/server/0036-Optimize-entity-coordinate-key.patch
View File

@@ -21,7 +21,7 @@ data is already available in the blockPosition struct, so we use that
instead of re-doing the casting. instead of re-doing the casting.
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index dacb00c7cb2702ae8e9c6be61ca08e41bd6009e4..b20ec9a39d6602451c36b31d401355c4b4674a87 100644 index dacb00c7cb2702ae8e9c6be61ca08e41bd6009e4..1e812c4f5a8d54293084de29e8731e0b8ddcc0ae 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java --- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -209,7 +209,7 @@ public final class MCUtil { @@ -209,7 +209,7 @@ public final class MCUtil {
@@ -34,7 +34,7 @@ index dacb00c7cb2702ae8e9c6be61ca08e41bd6009e4..b20ec9a39d6602451c36b31d401355c4
public static long getCoordinateKey(final ChunkPos pair) { public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7ebff259973a1c920a04041c77bcfe457f960993..4bda47a87071aafd7bbb8888ce522099940d3180 100644 index 99ded3ea60fa625f0a557d413dd1b063f827d10d..c73f2a697bcb4a670df37879dfc3e140290325bd 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

4
patches/server/0036-Reduce-in-wall-checks.patch → patches/server/0037-Reduce-in-wall-checks.patch
View File

@@ -27,7 +27,7 @@ but is so much cheaper than the suffocation check that it's worth
keeping it. keeping it.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 842f12ad6106eaa9a5bde69d3702abcac4d347b1..69b04b9e92985eef2a23a497387249c31918a7d8 100644 index e1614462ba2f186db2b9febcc86afc270754199c..d8ee1536244ab780bc0c5d4e1a72dad4a12328f1 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -399,7 +399,10 @@ public abstract class LivingEntity extends Entity { @@ -399,7 +399,10 @@ public abstract class LivingEntity extends Entity {
@@ -59,7 +59,7 @@ index 842f12ad6106eaa9a5bde69d3702abcac4d347b1..69b04b9e92985eef2a23a497387249c3
public boolean hurt(DamageSource source, float amount) { public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) { if (this.isInvulnerableTo(source)) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index a277e64b3bcfe3add3d3652b65255c8c91cdbdd8..870ca1a1d96b0554294a9fe27fc2abb9747f29f8 100644 index a80748f108c4973e1a3df7e0ff0e11160c91adb9..e6df3b765627d5aa800b1b697d1cfa96a676fe8e 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -101,6 +101,21 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -101,6 +101,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {

0
patches/server/0037-Don-t-trigger-lootable-refresh-for-non-player-intera.patch → patches/server/0038-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
View File

0
patches/server/0038-Reduce-hopper-item-checks.patch → patches/server/0039-Reduce-hopper-item-checks.patch
View File

0
patches/server/0039-Reduce-villager-item-re-pickup.patch → patches/server/0040-Reduce-villager-item-re-pickup.patch
View File

0
patches/server/0040-Do-not-log-invalid-statistics.patch → patches/server/0041-Do-not-log-invalid-statistics.patch
View File

0
patches/server/0041-Do-not-log-empty-message-warnings.patch → patches/server/0042-Do-not-log-empty-message-warnings.patch
View File

0
patches/server/0042-Do-not-log-ignored-advancements.patch → patches/server/0043-Do-not-log-ignored-advancements.patch
View File

0
patches/server/0043-Do-not-log-setBlock-in-far-chunks.patch → patches/server/0044-Do-not-log-setBlock-in-far-chunks.patch
View File

0
patches/server/0044-Do-not-log-unrecognized-recipes.patch → patches/server/0045-Do-not-log-unrecognized-recipes.patch
View File

0
patches/server/0045-Do-not-log-legacy-Material-initialization.patch → patches/server/0046-Do-not-log-legacy-Material-initialization.patch
View File

0
patches/server/0046-Do-not-log-expired-message-warnings.patch → patches/server/0047-Do-not-log-expired-message-warnings.patch
View File

0
patches/server/0047-Do-not-log-Not-Secure-marker.patch → patches/server/0048-Do-not-log-Not-Secure-marker.patch
View File

0
patches/server/0048-Softly-log-invalid-pool-element-errors.patch → patches/server/0049-Softly-log-invalid-pool-element-errors.patch
View File