Update Paper

AtlasMediaGroup · May 8, 2024 · a46abce · a46abce
1 parent 6a1a02d
commit a46abce
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -49,7 +49,6 @@ subprojects {
     repositories {
         mavenCentral()
         maven(paperMavenPublicUrl)
-        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") // TODO - Adventure snapshot
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.20.6-R0.1-SNAPSHOT
 
 mcVersion=1.20.6
-paperRef=716dfd869822a2694fcc2e097ebe404862660853
+paperRef=5729b294eef2ffde690f73c5b14a64a31f301084
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0010-Prevent-attributes-with-invalid-namespaces-from-bein.patch b/patches/server/0010-Prevent-attributes-with-invalid-namespaces-from-bein.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent attributes with invalid namespaces from being applied
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index ab23597a099a2785c803e08c93ff9f046a4af677..8fa0557cbf17fee958da9bd8d09a51748282a980 100644
+index 03f9fff7c06bf5f166d6277e3aa6adb5f646042d..1c48622db32bc99527bb551b5b71215b4eaf123c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -50,6 +50,7 @@ import net.minecraft.nbt.NbtIo;
@@ -17,7 +17,7 @@ index ab23597a099a2785c803e08c93ff9f046a4af677..8fa0557cbf17fee958da9bd8d09a5174
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.util.Unit;
  import net.minecraft.world.entity.EquipmentSlotGroup;
-@@ -734,7 +735,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -739,7 +740,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  continue;
              }
              String attributeName = (String) obj;

diff --git a/patches/server/0015-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch b/patches/server/0015-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch
@@ -51,7 +51,7 @@ index 4d7454e5a64fc18e63793a221daa94617f17c666..0ebc9b469d684251ba73989b3f748352
              } else {
                  Iterator iterator1 = this.level().getEntities(this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D)).iterator();
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index b068cff9b5aa457d65b679529956e8210296d799..9efea76afdbe653d8071936d553aea3b31d4f8e3 100644
+index b068cff9b5aa457d65b679529956e8210296d799..8274154f2ce4a752ea49790c6526ecb353934a04 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
@@ -89,7 +89,7 @@ index b068cff9b5aa457d65b679529956e8210296d799..9efea76afdbe653d8071936d553aea3b
              }
 +            // Scissors start - Add collision debounce
 +            if (list.size() > 15) {
-+                this.discard();
++                this.discard(null);
 +            } else if (list.size() > 3) {
 +                lastLargeCollision = System.currentTimeMillis();
 +            }