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

changes

Browse Source
This commit is contained in:
Telesphoreo 2023-10-19 02:03:56 -05:00
parent e0f91f7178
commit 58a5036119
5 changed files with 996 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "submodules/AdvancedSlimePaper"] [submodule "submodules/AdvancedSlimePaper"]
path = submodules/AdvancedSlimePaper path = submodules/AdvancedSlimePaper
url = https://github.com/InfernalSuite/AdvancedSlimePaper.git url = https://github.com/InfernalSuite/AdvancedSlimePaper.git
branch = paper_upstream branch = paper_upstream-fixes

2
aswm-api/build.gradle.kts
View File

@ -8,7 +8,7 @@ dependencies {
api("com.flowpowered:flow-nbt:2.0.2") api("com.flowpowered:flow-nbt:2.0.2")
api("org.jetbrains:annotations:23.0.0") api("org.jetbrains:annotations:23.0.0")
compileOnly("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT") compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
} }
java { java {

2
build.gradle.kts
View File

@ -2,7 +2,7 @@ plugins {
java java
`maven-publish` `maven-publish`
id("com.github.johnrengelman.shadow") version "8.1.1" apply false id("com.github.johnrengelman.shadow") version "8.1.1" apply false
id("io.papermc.paperweight.patcher") version "1.5.7-SNAPSHOT" id("io.papermc.paperweight.patcher") version "1.5.8"
} }
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"

993
patches/server/0001-AdvancedSlimePaper-Server-Changes.patch
View File

File diff suppressed because it is too large Load Diff

4
patches/server/0040-Prevent-player-banning-using-duplicate-UUIDs.patch
View File

@ -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 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 17610196db7a1c6feb2cf74a02479a8691aa323f..70c52e2293d64d32fdcebbcd0678e0c80d35fbb8 100644 index 3f26fdcc5cbf0a684ad724ab8c042d0053cc187e..c6f36a6b967aeb6ffdf5b099b2692e038401dc79 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1644,7 +1644,13 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -1664,7 +1664,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (entity != null) { if (entity != null) {
ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID()); ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID());
entity.unRide(); entity.unRide();