diff options
author | MiniDigger | Martin <[email protected]> | 2023-09-22 19:31:02 +0200 |
---|---|---|
committer | MiniDigger | Martin <[email protected]> | 2023-09-22 19:31:02 +0200 |
commit | 1ebaffacf586d448f8cdbca511b1f6c454fc51b3 (patch) | |
tree | de2ec952d3499ae900e69e6e0b16e1534ace909e /patches/server/0009-MC-Utils.patch | |
parent | f4d8a6409425b64c67aa97e15db7532199efaed6 (diff) | |
download | Paper-1ebaffacf586d448f8cdbca511b1f6c454fc51b3.tar.gz Paper-1ebaffacf586d448f8cdbca511b1f6c454fc51b3.zip |
some compile fixes
Diffstat (limited to 'patches/server/0009-MC-Utils.patch')
-rw-r--r-- | patches/server/0009-MC-Utils.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch index 00ab2f6b4e..8509d0c40b 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/server/0009-MC-Utils.patch @@ -5468,7 +5468,7 @@ index 0000000000000000000000000000000000000000..808d1449ac44ae86a650932365081fba + } +} diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index 092bfedfb32c38550d1cab1b696feac6df09131f..9870eccc1dc5c2201f12f8e2affe647f6b0375f8 100644 +index c2b1430ba41ec0e54ad08214c57ed97c21cdb3b9..296b433ee309044a902e018f9107b0994f9eada5 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -118,7 +118,7 @@ public class Util { @@ -5481,7 +5481,7 @@ index 092bfedfb32c38550d1cab1b696feac6df09131f..9870eccc1dc5c2201f12f8e2affe647f public static long getEpochMillis() { diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index 2bb5e51f71cbf66819d198505aa4a5ecffd246c6..1834f3efb05fd70c8c1c67733bff514829ae1154 100644 +index bc7b8e41dedeb6ba76f4d9d6240ecd218f376bd8..7bd9a626c6ce9c5fb58c3d865e656bd9f8e11116 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -562,6 +562,7 @@ public class BlockPos extends Vec3i { @@ -5501,7 +5501,7 @@ index 2bb5e51f71cbf66819d198505aa4a5ecffd246c6..1834f3efb05fd70c8c1c67733bff5148 @Override public BlockPos immutable() { diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java -index 666df22c8f847ef7152669540a3844566ef90d78..92095b494a0c4fb89b84f0b1c0376615d28e34ce 100644 +index b25829cebb99ef4843fb35faa1b8c6d3cad5f7d0..ce6ec14a8022b253efff5d9b34d93b5fdd1df1b6 100644 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java @@ -160,7 +160,7 @@ public class CompoundTag implements Tag { @@ -5525,7 +5525,7 @@ index 666df22c8f847ef7152669540a3844566ef90d78..92095b494a0c4fb89b84f0b1c0376615 return NbtUtils.loadUUID(this.get(key)); } diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java -index 427959874b7f167184785a582163029ad4a66df2..344c5af75c4a66bb27f3f422937c6c427c15ed25 100644 +index 2c4855bbf63397226aadf7865c2cad0258c5a15e..69aa29e5e7e6f53e9c1904463ff4a58f0994b733 100644 --- a/src/main/java/net/minecraft/network/PacketEncoder.java +++ b/src/main/java/net/minecraft/network/PacketEncoder.java @@ -46,7 +46,7 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> { @@ -6622,7 +6622,7 @@ index 0fcac9b089e030b387d1b4c79c26e69ed9dcf4ed..10b263b2693a6b507c858b6550b5b98a GameProfileCache usercache = this.server.getProfileCache(); String s; diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java -index 337e0a7b3c14e1b1a28744920e0dc0a69e0c5a87..f5829ae484d93b547a5437b85a9621346384a11b 100644 +index 5c14223b231e748b44e0fcee36145f50384d88d0..ffb691898d1c9c108be520dc8968214eacb425d5 100644 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java +++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java @@ -78,6 +78,13 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler @@ -6693,7 +6693,7 @@ index 21fa43e0c3fabf74919f7e41d074ab1f7c061967..5e9cf929674888b3a143a0691dc6936b return this.getWalkTargetValue(pos, this.level()); } diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java -index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292544e9f3c 100644 +index aee69ad9f2545f9c267ed147800742f05e09aafc..78a170c4f2f52a6cff36b3602c9f86b3b4d95e72 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Monster.java +++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java @@ -27,6 +27,7 @@ import net.minecraft.world.level.ServerLevelAccessor; @@ -6771,7 +6771,7 @@ index 1c71d2c1b16bdba1e14a8230787e4cb4ad530163..d6d8bbc98fc71997cb52521d59ebb59d FluidState getFluidState(BlockPos pos); diff --git a/src/main/java/net/minecraft/world/level/ChunkPos.java b/src/main/java/net/minecraft/world/level/ChunkPos.java -index 43bb3f5a617f4a6d719b02023a71edcb12aa9d05..34457c8afb4575d2395148f0a2bde6a96ec5e797 100644 +index eac73ec6bef18e266474d1587f738f1938ecc67c..fa06445d9cf6da63cfd11042f82bada77f153b38 100644 --- a/src/main/java/net/minecraft/world/level/ChunkPos.java +++ b/src/main/java/net/minecraft/world/level/ChunkPos.java @@ -20,6 +20,7 @@ public class ChunkPos { @@ -6816,7 +6816,7 @@ index 43bb3f5a617f4a6d719b02023a71edcb12aa9d05..34457c8afb4575d2395148f0a2bde6a9 } diff --git a/src/main/java/net/minecraft/world/level/EmptyBlockGetter.java b/src/main/java/net/minecraft/world/level/EmptyBlockGetter.java -index 3c707d6674b2594b09503b959a31c1f4ad3981e6..db61b6b0158a9bcc0e1d735e34fe3671f8c89e21 100644 +index a1a94c0a51d793e47c2c6575ccbd61a0fe7ea9cc..546b218e835467416c6675105809e662650e15d0 100644 --- a/src/main/java/net/minecraft/world/level/EmptyBlockGetter.java +++ b/src/main/java/net/minecraft/world/level/EmptyBlockGetter.java @@ -17,6 +17,18 @@ public enum EmptyBlockGetter implements BlockGetter { @@ -6926,7 +6926,7 @@ index bacd4d875642cd93c3185f788745dd73a3cfde8a..003e2064f64115d1f5c48ac97e16100d return chunk.getBlockState(pos); } diff --git a/src/main/java/net/minecraft/world/level/LevelReader.java b/src/main/java/net/minecraft/world/level/LevelReader.java -index e6aabec35f4e27623d1fbbfb285cc78531137014..cc0d20e9f851268fe8403ac516f426ec1d008150 100644 +index d0591bfe1a4a487d57fbe9202e2bd6fb1b803080..276b5ff0c70d2a47a7be2ff82288dc8dc5f3b47a 100644 --- a/src/main/java/net/minecraft/world/level/LevelReader.java +++ b/src/main/java/net/minecraft/world/level/LevelReader.java @@ -26,6 +26,9 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, Signal @@ -6940,7 +6940,7 @@ index e6aabec35f4e27623d1fbbfb285cc78531137014..cc0d20e9f851268fe8403ac516f426ec @Deprecated boolean hasChunk(int chunkX, int chunkZ); diff --git a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java -index 249b3ed33672a9a9529bd14de978722b62019314..0f1025495237aebe30132ace0832aa5718d6f9bb 100644 +index 4756e9d283b9eeeffd2189b777237223b2bc3477..a798db400670f49f5acfd287501fea9a065f6359 100644 --- a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java +++ b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java @@ -9,6 +9,7 @@ import net.minecraft.core.Holder; @@ -7261,7 +7261,7 @@ index 4185b7528ac757a2d6ebca4da4d46e65b7a981d0..b32e1bba27c91e81b7382072c4d8230d @Override diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java -index 51a0ddcee9a9cb1040fda643a6442d2e2e15b8a0..38ec21faaa16df5485a81a581506700a5ab0a440 100644 +index d2198dd0e47311c59ad5d955d369230837b519be..28910f4db8831fc8bc154f57b6685cf4fd039f40 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java @@ -72,6 +72,18 @@ public class ProtoChunk extends ChunkAccess { |