diff --git a/gradle.properties b/gradle.properties index cab7695..8745fb1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.18.2-R0.1-SNAPSHOT mcVersion=1.18.2 -paperRef=9b492cff368f2606e769f90e814e7ed378c0b52a +paperRef=fc1752ff15f442eb4488ac78e4728b91223d3e2d org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0033-Don-t-log-invalid-teams-to-console.patch b/patches/server/0031-Don-t-log-invalid-teams-to-console.patch similarity index 86% rename from patches/server/0033-Don-t-log-invalid-teams-to-console.patch rename to patches/server/0031-Don-t-log-invalid-teams-to-console.patch index ae89a35..f6c69b4 100644 --- a/patches/server/0033-Don-t-log-invalid-teams-to-console.patch +++ b/patches/server/0031-Don-t-log-invalid-teams-to-console.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't log invalid teams to console diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 68ae4dfe3f4a77605b19607b5f04a2a6d07d6fc8..b7efb87767570992e9bb14510e510f2b37ec2226 100644 +index 09bc172810a6dec80cddc943368a5fd83fa6e510..5e5ae396f2c5d44d0d942e7ed8f60963dfff61c2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -816,7 +816,9 @@ public abstract class LivingEntity extends Entity { +@@ -812,7 +812,9 @@ public abstract class LivingEntity extends Entity { boolean flag = scoreboardteam != null && this.level.getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam); if (!flag) {