AtlasMediaGroup
/
Scissors
mirror of https://github.com/AtlasMediaGroup/Scissors.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Paper

This commit is contained in:
Telesphoreo 2023-08-16 18:25:45 -05:00
parent c4826c11c8
commit e1d2dd4813
No known key found for this signature in database
GPG Key ID: 9D1991811E093C02
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
version=1.20.1-R0.1-SNAPSHOT
mcVersion=1.20.1
paperRef=23c44c2b8d88b287060cc61be58e8d86f1ee5c54
paperRef=73af2d4cea597e65dd13dafab6325ea5709c9067
org.gradle.caching=true
org.gradle.parallel=true

6
patches/server/0013-Better-handling-of-invalid-JSON-components.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Better handling of invalid JSON components
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index cb4379268b191d331c71be44642baac381ffaaf6..aac5d814fab2e8f59c489e28a28886e91660b840 100644
index c69088a2ec374b2d236fec61e267f42afa2967b1..7ca1ece926b0ef4598d4fa913b96d1e7a0e5bba4 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -547,13 +547,7 @@ public final class MCUtil {
@@ -559,13 +559,7 @@ public final class MCUtil {
return null;
}
String string = compound.getString(key);
@ -128,7 +128,7 @@ index 97a2657bc98d41c3c1e376b266d2c85f685acc88..9d20f3f1af8e663a8c13714c8928d4a9
}
}).reduce((accumulator, current) -> {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 4c298406ce06d39f8279049270c88ec0830733b1..1ccf49559e12f46e5324c63d5b0a3329b01c9440 100644
index 2edab21bb271405f200de5a19e9c748bb14aba7d..afd25ef82b88521925d2b92286ab8fbda9983a0a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2485,12 +2485,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

4
patches/server/0029-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
index a25b87311883c2fc2e9bd3707c79b88cbab0c3d9..d40399fd67bd95f58cc1a99c93feb55decd5601a 100644
index ad24f48d9d3d633d37d42978ded3c98a4a447e50..e3691dfadf6290775eaedd24383e02aeec5d0a9f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -30,6 +30,7 @@ import java.util.function.UnaryOperator;
@ -16,7 +16,7 @@ index a25b87311883c2fc2e9bd3707c79b88cbab0c3d9..d40399fd67bd95f58cc1a99c93feb55d
import net.minecraft.ChatFormatting;
import net.minecraft.CrashReport;
import net.minecraft.CrashReportCategory;
@@ -3045,6 +3046,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3046,6 +3047,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
return;
}

4
patches/server/0035-Add-configuration-option-to-disable-chat-signatures.patch
View File

@ -60,7 +60,7 @@ index c0a80824a0307ea673805015119cc834b268f0dc..9f28f86b1b56ea55ab39f6ac988c1f47
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index f240918e38c09b303f202d626f152fc3d0d9dc06..0148820d45a62c58545b1aac84c69e53ff6fc476 100644
index 054f25b360a46330391cd22ed9888ccc8c40de4d..82b1a4008805f7eb2df61b3909cdbdaa8f073e08 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1,5 +1,6 @@
@ -95,7 +95,7 @@ index f240918e38c09b303f202d626f152fc3d0d9dc06..0148820d45a62c58545b1aac84c69e53
ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
}
@@ -3681,6 +3684,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3682,6 +3685,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());