Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Paper, light patch

Browse Source
This commit is contained in:
Cryptite
2021-10-05 09:18:13 -05:00
parent 0a803d73b4
commit d859adcb90
7 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=com.lokamc.slice
version=1.17.1-R0.1-SNAPSHOT
mcVersion=1.17.1
paperRef=f905057070b0a272c281ff767adcea3a0aca9601
paperRef=a3dfe6dca5e2a5fadd232e9ea3425ec0841de2c3
org.gradle.caching=true
org.gradle.parallel=true

4
patches/api/0006-Add-provided-Material-to-getDrops.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add provided Material to getDrops
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 6ef43ae39a8ad4ed0e9a7bf68c17840576e235ea..7a8c5e87e429c711e23dab3fa9449601aa07a414 100644
index 798b46e9a394c124327537b90afe41f4a2ebc2f0..b99b70d3b70fef71706fce5e61054fa30d9e628f 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -587,6 +587,20 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
@@ -595,6 +595,20 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
@NotNull
Collection<ItemStack> getDrops(@NotNull ItemStack tool, @Nullable Entity entity);

8
patches/server/0001-Build-Changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Build Changes
diff --git a/build.gradle.kts b/build.gradle.kts
index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..df6ee4c3158d9530d6d890d4ad617cc78df469b8 100644
index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..9dbad4407dcf1a7070d5c5a692473cf57a4543e7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,8 +29,8 @@ repositories {
@@ -38,7 +38,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..df6ee4c3158d9530d6d890d4ad617cc7
workingDir = rootProject.layout.projectDirectory.dir(
providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1d7c26354eee1dff5e66b6234d408ed8f800415c..29e77a745705196f55495826cb38104637388e1f 100644
index fe6d5051b139cd6079e288ffdf20e30fdd46fdda..c3c2b44c998ccb73594e4f33a571508a4c8d7d77 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -51,10 +51,10 @@ index 1d7c26354eee1dff5e66b6234d408ed8f800415c..29e77a745705196f55495826cb381046
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c1fc309411c277f7b7450686543a6a7a7fe2fdb1..46907276e5a9c66a1b1b0e3b85cf23c4067f2c86 100644
index f925130552cb4ff2f813b1ddae9ac2f915e17bd5..7df81489dd9d3c7ed84b3b6bdf2b724903fbcdc4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {

6
patches/server/0004-Set-BlockData-without-light-update.patch
View File

@@ -99,10 +99,10 @@ index 8c30e28b97ac7e8b54322c903e0b75ee8135620b..64cc26d146afba7c6ecb0d3052776837
}
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index a53a9974a2358fa4b6a7216e4b849bd3ad5023ea..68fbf05b07ffe028993184261dbd1a61c3c45aa5 100644
index e3944d0f4fd18ef6c545dc4a131c0b120dff753a..652c72df86dc60c0af099b24a1017472da309f8b 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -179,11 +179,20 @@ public class CraftBlock implements Block {
@@ -178,11 +178,20 @@ public class CraftBlock implements Block {
@Override
public void setBlockData(BlockData data, boolean applyPhysics) {
@@ -124,7 +124,7 @@ index a53a9974a2358fa4b6a7216e4b849bd3ad5023ea..68fbf05b07ffe028993184261dbd1a61
net.minecraft.world.level.block.state.BlockState old = this.getNMS();
// SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup
if (old.hasBlockEntity() && blockData.getBlock() != old.getBlock()) { // SPIGOT-3725 remove old tile entity if block changes
@@ -198,7 +207,7 @@ public class CraftBlock implements Block {
@@ -197,7 +206,7 @@ public class CraftBlock implements Block {
if (applyPhysics) {
return this.world.setBlock(position, blockData, 3);
} else {

4
patches/server/0005-Don-t-send-equipment-updates-if-only-durability-chan.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Don't send equipment updates if only durability changed
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 1149a15486016ac101c5976b45b7d1c1109244ce..47b8e4f51fd63894926f41220f94fd8a65a57d7f 100644
index 1018f4640bab5876c5e0afb5b88f71437fb79662..5c9630008533276f393a276f1247e1f5fae75326 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2996,7 +2996,7 @@ public abstract class LivingEntity extends Entity {
@@ -2995,7 +2995,7 @@ public abstract class LivingEntity extends Entity {
ItemStack itemstack1 = this.getItemBySlot(enumitemslot);

6
patches/server/0011-Add-provided-Material-to-getDrops.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add provided Material to getDrops
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 68fbf05b07ffe028993184261dbd1a61c3c45aa5..3aa0f3e1ab17e5fcb89fde9f3a1802c605a3f7e4 100644
index 652c72df86dc60c0af099b24a1017472da309f8b..f975d8e88cabaa212b5da1e6e3313b39495112ca 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -705,7 +705,18 @@ public class CraftBlock implements Block {
@@ -541,7 +541,18 @@ public class CraftBlock implements Block {
@Override
public Collection<ItemStack> getDrops(ItemStack item, Entity entity) {
@@ -28,7 +28,7 @@ index 68fbf05b07ffe028993184261dbd1a61c3c45aa5..3aa0f3e1ab17e5fcb89fde9f3a1802c6
net.minecraft.world.item.ItemStack nms = CraftItemStack.asNMSCopy(item);
// Modelled off EntityHuman#hasBlock
@@ -716,6 +727,7 @@ public class CraftBlock implements Block {
@@ -552,6 +563,7 @@ public class CraftBlock implements Block {
return Collections.emptyList();
}
}

19
patches/server/0012-Allow-access-to-LightEngine.patch Normal file
View File

@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Cryptite <cryptite@gmail.com>
Date: Tue, 5 Oct 2021 09:05:10 -0500
Subject: [PATCH] Allow access to LightEngine
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index b3c99c1678c3ee159861c8aac38e765d664c4d1d..b6e1459db7f03801073d39ead5cd08fda8c9b4ba 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -702,7 +702,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
return Math.max(Math.abs(k), Math.abs(l));
}
- protected ThreadedLevelLightEngine getLightEngine() {
+ public ThreadedLevelLightEngine getLightEngine() { // Slice (public)
return this.lightEngine;
}