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 2022-08-03 19:52:04 -05:00
parent 4a96d6865f
commit a2f43a7ab4
4 changed files with 9 additions and 9 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.19.1-R0.1-SNAPSHOT
mcVersion=1.19.1
paperRef=7044a9c538edb16239a0579722968d395842cdbe
paperRef=69950d5a6a22908368bf081c5006ec36d176fd14
org.gradle.caching=true
org.gradle.parallel=true

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

@ -6,10 +6,10 @@ 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
index c39e6a96a120cd9c5f7734ead5dac2091fed7fc8..4e75fdc2da5b04749fef5fad6d3f36e02f60cf59 100644
index 2fab929b6775238d031ca3305b61af3cbe920a06..9bae012733010121e7b33bfd7722bc0fc6f1182c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1935,6 +1935,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1936,6 +1936,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
// Spigot end
@ -28,7 +28,7 @@ index c39e6a96a120cd9c5f7734ead5dac2091fed7fc8..4e75fdc2da5b04749fef5fad6d3f36e0
@Override
public void handleUseItemOn(ServerboundUseItemOnPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
@@ -3439,17 +3451,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3447,17 +3459,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
BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);

4
patches/server/0032-Add-spectator-teleport-event.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add spectator teleport event
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8e1a4302c62090b19e0ace2bb8fa1344afd0474e..814c0ea4b59dbb82e973810a36c81237c9e5f2d6 100644
index 9bae012733010121e7b33bfd7722bc0fc6f1182c..c96f3276795b969abb4d71459926f18227a76517 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 @@
@ -15,7 +15,7 @@ index 8e1a4302c62090b19e0ace2bb8fa1344afd0474e..814c0ea4b59dbb82e973810a36c81237
import com.google.common.collect.Lists;
import com.google.common.primitives.Floats;
import com.mojang.brigadier.ParseResults;
@@ -2077,6 +2078,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2078,6 +2079,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
Entity entity = packet.getEntity(worldserver);
if (entity != null) {

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
index 481359dc2dee9394d9390b24b4f51f3def6b5ccf..e2b7bc274325de3a30c50ba3ce7aee5f19ab177a 100644
index c96f3276795b969abb4d71459926f18227a76517..5be2ff47ba2ee40aa4a02ceea77bc0af03641e97 100644
--- a/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;
@ -17,7 +17,7 @@ index 481359dc2dee9394d9390b24b4f51f3def6b5ccf..e2b7bc274325de3a30c50ba3ce7aee5f
import net.minecraft.ChatFormatting;
import net.minecraft.CrashReport;
import net.minecraft.CrashReportCategory;
@@ -3086,6 +3088,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3094,6 +3096,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
public void handleContainerClick(ServerboundContainerClickPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
if (this.player.isImmobile()) return; // CraftBukkit
@ -25,7 +25,7 @@ index 481359dc2dee9394d9390b24b4f51f3def6b5ccf..e2b7bc274325de3a30c50ba3ce7aee5f
this.player.resetLastActionTime();
if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit
boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if
@@ -3107,6 +3110,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3115,6 +3118,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
return;
}