diff --git a/README.md b/README.md index 31471e1..78f0b46 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Scissors [![Build Status](https://ci.scissors.gg/job/Scissors/job/1.20.2/badge/icon)](https://ci.scissors.gg/job/Scissors/job/1.20.2/) +# Scissors [![Build Status](https://ci.scissors.gg/job/Scissors/job/1.20.4/badge/icon)](https://ci.scissors.gg/job/Scissors/job/1.20.4/) Scissors is a fork of Paper that aims to fix exploits possible in Creative Mode. Many of these exploits are ones that Paper's own team has either refused to fix or would have. ## Links ### [Scissors Download](https://ci.plex.us.org/job/Scissors) -### [Scissors Javadoc](https://javadoc.scissors.gg/1.20.2) +### [Scissors Javadoc](https://javadoc.scissors.gg/1.20.4) ### [Scissors Announcements](https://totalfreedom.tf/forums/scissors-announcements.55) ### [Scissors General Discussion](https://totalfreedom.tf/forums/scissors-discussion.56/) diff --git a/gradle.properties b/gradle.properties index 82b73ba..a77c774 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.4-R0.1-SNAPSHOT mcVersion=1.20.4 -paperRef=5e978d3a3d2c8068ea152ea5a38938f1f8c15d94 +paperRef=1fa48d140c5469d894b436a7ba0cb5cb6f819ee0 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0039-Prevent-player-banning-using-duplicate-UUIDs.patch b/patches/server/0039-Prevent-player-banning-using-duplicate-UUIDs.patch index 5b99e9c..1740a55 100644 --- a/patches/server/0039-Prevent-player-banning-using-duplicate-UUIDs.patch +++ b/patches/server/0039-Prevent-player-banning-using-duplicate-UUIDs.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Prevent player banning using duplicate UUIDs diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b78a9628a88f2a495ef6de74446a02a14d41a1f6..04f3d427dabf04b12c7fb6e7991c4af5e8d6e4a8 100644 +index 676087c3addd712939c865b39ddb5d9f0bc7ce25..69a0d8c05c90ca8c9009c98a47d1e2aea94a571f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1668,7 +1668,13 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1673,7 +1673,13 @@ public class ServerLevel extends Level implements WorldGenLevel { if (entity != null) { ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID()); entity.unRide();