diff --git a/gradle.properties b/gradle.properties index e7edaa1..be12a3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=dadd8b5a7cf3775f9d9778f17bf7a0bedfe0a768 +paperRef=5de0f8ac48944c6fe4dd127390a0ea08705cc2d9 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0032-Fix-ClickEvents-on-Signs-bypassing-permissions.patch b/patches/server/0032-Fix-ClickEvents-on-Signs-bypassing-permissions.patch index 5d34213..10b87d3 100644 --- a/patches/server/0032-Fix-ClickEvents-on-Signs-bypassing-permissions.patch +++ b/patches/server/0032-Fix-ClickEvents-on-Signs-bypassing-permissions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix ClickEvents on Signs bypassing permissions diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 0521240dddde12d78cc05deda7fac11690f5d155..694d99d345025450bebc4c207392151c2f0085e3 100644 +index f356196aaeb498a6d2c9ad2112329cef5a3103d6..a8d8445be1cfb67de1adcaf64847d0bfaf8c503d 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java @@ -8,8 +8,10 @@ import java.util.Objects; @@ -43,7 +43,7 @@ index 0521240dddde12d78cc05deda7fac11690f5d155..694d99d345025450bebc4c207392151c public class SignBlockEntity extends BlockEntity implements CommandSource { // CraftBukkit - implements -@@ -286,6 +291,21 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C +@@ -291,6 +296,21 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C } player.getServer().getCommands().performPrefixedCommand(this.createCommandSourceStack(((org.bukkit.craftbukkit.entity.CraftPlayer) event.getPlayer()).getHandle(), world, pos), event.getMessage()); // Paper end diff --git a/patches/server/0046-Limit-beacon-effectRange.patch b/patches/server/0046-Limit-beacon-effectRange.patch index 60ff631..aa6855e 100644 --- a/patches/server/0046-Limit-beacon-effectRange.patch +++ b/patches/server/0046-Limit-beacon-effectRange.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit beacon effectRange diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index 5005a0ad5f703727ea9c618ae4b769a77d5655b5..8645ebb37dfab4e76b238a3660816a59018d3dde 100644 +index 3b866e2c20ee7bfc981ff09b29065530de993778..cbffd654a25a5c498ea96059aa97ef0c012c923c 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -83,7 +83,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name @@ -17,7 +17,7 @@ index 5005a0ad5f703727ea9c618ae4b769a77d5655b5..8645ebb37dfab4e76b238a3660816a59 return this.levels * 10 + 10; } else { return effectRange; -@@ -415,6 +415,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name +@@ -424,6 +424,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name this.lockKey = LockCode.fromTag(nbt); this.effectRange = nbt.contains(PAPER_RANGE_TAG, 6) ? nbt.getDouble(PAPER_RANGE_TAG) : -1; // Paper