AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2024-11-27 07:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.19.2

Browse Source
This commit is contained in:
Telesphoreo 2022-08-05 20:54:38 -05:00
parent a2f43a7ab4
commit fa4a8298ed
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@ -1,8 +1,8 @@
group=me.totalfreedom.scissors group=me.totalfreedom.scissors
version=1.19.1-R0.1-SNAPSHOT version=1.19.2-R0.1-SNAPSHOT
mcVersion=1.19.1 mcVersion=1.19.2
paperRef=69950d5a6a22908368bf081c5006ec36d176fd14 paperRef=bef2c9d005bdd039f188ee53094a928e76bd8e59
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

6
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 diff --git a/build.gradle.kts b/build.gradle.kts
index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..ba15c2caa525bb56397be65e4393c9135b9caf6f 100644 index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..76295e3fbc7fa51d7f16a48bf2b70af210a87c82 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -9,8 +9,8 @@ plugins { @@ -9,8 +9,8 @@ plugins {
@ -15,7 +15,7 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..ba15c2caa525bb56397be65e4393c913
- implementation(project(":paper-api")) - implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi")) - implementation(project(":paper-mojangapi"))
+ implementation(project(":Scissors-API")) + implementation(project(":Scissors-API"))
+ implementation("io.papermc.paper:paper-mojangapi:1.19.1-R0.1-SNAPSHOT") + implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT")
// Paper start // Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.minecrell:terminalconsoleappender:1.3.0")
@ -49,7 +49,7 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..ba15c2caa525bb56397be65e4393c913
standardInput = System.`in` standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory workingDir = rootProject.layout.projectDirectory
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 46fcecbfb3f866ba89036a11113c8ad0989b04bc..0c6c6f611c3376b938baa22c196c5b44cdeb1b21 100644 index f23be38ef96a81ce3867a3b6fdccf632fe285f31..245b713f0a292b04481b767495d6210f0e00b846 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
@@ -1655,7 +1655,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1655,7 +1655,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

4
patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Validate coordinates before attempting to get block entities
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 2fab929b6775238d031ca3305b61af3cbe920a06..9bae012733010121e7b33bfd7722bc0fc6f1182c 100644 index dbefefc123e3cb38a95bd321d74c384bc087cfba..503f29f9821f124c61bdcaac5ea2386088e15f02 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1936,6 +1936,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -1936,6 +1936,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@ -28,7 +28,7 @@ index 2fab929b6775238d031ca3305b61af3cbe920a06..9bae012733010121e7b33bfd7722bc0f
@Override @Override
public void handleUseItemOn(ServerboundUseItemOnPacket packet) { public void handleUseItemOn(ServerboundUseItemOnPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
@@ -3447,17 +3459,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -3448,17 +3460,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot
BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound); BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);

6
patches/server/0033-Prevent-invalid-container-events.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Prevent invalid container events
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c96f3276795b969abb4d71459926f18227a76517..5be2ff47ba2ee40aa4a02ceea77bc0af03641e97 100644 index 35305f623e628e8ab40d97a084d3435aabec278b..e0dbf2363ba207f6d2e263dc036d89ec70f758a0 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -29,6 +29,8 @@ import java.util.function.UnaryOperator; @@ -29,6 +29,8 @@ import java.util.function.UnaryOperator;
@ -17,7 +17,7 @@ index c96f3276795b969abb4d71459926f18227a76517..5be2ff47ba2ee40aa4a02ceea77bc0af
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.CrashReport; import net.minecraft.CrashReport;
import net.minecraft.CrashReportCategory; import net.minecraft.CrashReportCategory;
@@ -3094,6 +3096,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -3095,6 +3097,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
public void handleContainerClick(ServerboundContainerClickPacket packet) { public void handleContainerClick(ServerboundContainerClickPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
if (this.player.isImmobile()) return; // CraftBukkit if (this.player.isImmobile()) return; // CraftBukkit
@ -25,7 +25,7 @@ index c96f3276795b969abb4d71459926f18227a76517..5be2ff47ba2ee40aa4a02ceea77bc0af
this.player.resetLastActionTime(); this.player.resetLastActionTime();
if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit
boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if
@@ -3115,6 +3118,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -3116,6 +3119,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
return; return;
} }

10
patches/server/0039-Add-configuration-option-to-disable-chat-signatures.patch
View File

@ -33,7 +33,7 @@ index 9cd5ffca69df27f794f5a72e687fc6b3ae0f1656..9cf8f5d85a873c1c6c85b45246d01d4b
{ {
config.set(path, val); config.set(path, val);
diff --git a/src/main/java/net/minecraft/network/chat/OutgoingPlayerChatMessage.java b/src/main/java/net/minecraft/network/chat/OutgoingPlayerChatMessage.java diff --git a/src/main/java/net/minecraft/network/chat/OutgoingPlayerChatMessage.java b/src/main/java/net/minecraft/network/chat/OutgoingPlayerChatMessage.java
index fc43cc6f5bbb3485b9ddcc441a13399e57289586..e1ddf22f1829234b32a549cbe0ca10d7114aafde 100644 index bd82f0316df85b621c1970ff30bbbec0d2712ccd..04195891391ebd53f5acf27db15e6a991f554d40 100644
--- a/src/main/java/net/minecraft/network/chat/OutgoingPlayerChatMessage.java --- a/src/main/java/net/minecraft/network/chat/OutgoingPlayerChatMessage.java
+++ b/src/main/java/net/minecraft/network/chat/OutgoingPlayerChatMessage.java +++ b/src/main/java/net/minecraft/network/chat/OutgoingPlayerChatMessage.java
@@ -2,6 +2,7 @@ package net.minecraft.network.chat; @@ -2,6 +2,7 @@ package net.minecraft.network.chat;
@ -44,9 +44,9 @@ index fc43cc6f5bbb3485b9ddcc441a13399e57289586..e1ddf22f1829234b32a549cbe0ca10d7
import net.minecraft.core.RegistryAccess; import net.minecraft.core.RegistryAccess;
import net.minecraft.network.PacketSendListener; import net.minecraft.network.PacketSendListener;
import net.minecraft.network.protocol.game.ClientboundPlayerChatHeaderPacket; import net.minecraft.network.protocol.game.ClientboundPlayerChatHeaderPacket;
@@ -86,6 +87,14 @@ public interface OutgoingPlayerChatMessage { @@ -87,6 +88,14 @@ public interface OutgoingPlayerChatMessage {
// Paper end // Paper end
PlayerChatMessage playerChatMessage = this.message.filter(bl); PlayerChatMessage playerChatMessage = this.message.filter(filterMaskEnabled);
playerChatMessage = unsigned != null ? playerChatMessage.withUnsignedContent(unsigned) : playerChatMessage; // Paper playerChatMessage = unsigned != null ? playerChatMessage.withUnsignedContent(unsigned) : playerChatMessage; // Paper
+ +
+ // Scissors start - Add configuration option to disable chat signatures + // Scissors start - Add configuration option to disable chat signatures
@ -57,5 +57,5 @@ index fc43cc6f5bbb3485b9ddcc441a13399e57289586..e1ddf22f1829234b32a549cbe0ca10d7
+ // Scissors end + // Scissors end
+ +
if (!playerChatMessage.isFullyFiltered()) { if (!playerChatMessage.isFullyFiltered()) {
this.playersWithFullMessage.add(serverPlayer); this.playersWithFullMessage.add(sender);
RegistryAccess registryAccess = serverPlayer.level.registryAccess(); RegistryAccess registryAccess = sender.level.registryAccess();