Skip to content

Commit

Permalink
Updated Upstream (ShreddedPaper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

ShreddedPaper Changes:
MultiPaper/ShreddedPaper@a0dd039 Limit eye of ender velocity
MultiPaper/ShreddedPaper@2c77569 Don't allow breaking blocks outside of our region
  • Loading branch information
404Setup committed Aug 29, 2024
1 parent 2391f47 commit 7198913
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = one.tranic.vine
version = 1.20.6-R0.1-SNAPSHOT
mcVersion = 1.20.6

spRef = 6c398ccf7542c043cae5da7d3c68b06b792cf4de
spRef = 2c77569e4d4986699602faadd8658f98d60675db

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0008-Nbt-Utils.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Nbt Utils


diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b015fe3b2a7ef9a13c6f91edb7fded542e2e8604..af86daf687d4727f651b7590776f8d13b87de2e6 100644
index f45ae96bdb13e8d697fc48a50f3e405a3b681a73..55cf9f6e0529eab328c112322098dbb19207a2e1 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -436,6 +436,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
Expand Down Expand Up @@ -37,7 +37,7 @@ index b015fe3b2a7ef9a13c6f91edb7fded542e2e8604..af86daf687d4727f651b7590776f8d13

} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
@@ -5209,4 +5217,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -5208,4 +5216,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return false;
}
// Purpur end
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0029-Leaves-Entity-Utils.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Leaves: Entity Utils


diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index af86daf687d4727f651b7590776f8d13b87de2e6..54065a663adeec4f8d429a14dd1e4f5fd47a6f48 100644
index 55cf9f6e0529eab328c112322098dbb19207a2e1..b5e18649bb7b64df4f34b3deee5829dbdca8b915 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -437,6 +437,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
Expand Down Expand Up @@ -36,7 +36,7 @@ index af86daf687d4727f651b7590776f8d13b87de2e6..54065a663adeec4f8d429a14dd1e4f5f

} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
@@ -5221,4 +5228,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -5220,4 +5227,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public CompoundTag requestVineStorage() {
return vineStorage;
}
Expand Down
25 changes: 25 additions & 0 deletions patches/server/0070-lithium-fast-powder-snow-check.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: 404Setup <153366651+404Setup@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:20:25 +0800
Subject: [PATCH] lithium: fast powder snow check

You can find the original code on https://github.com/CaffeineMC/lithium-fabric

diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index eb30577154677fb42c0b4c116064e455abd4e16f..373341615b4097a0f4f137e3431846958aa0091f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -599,11 +599,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
}

protected void tryAddFrost() {
- if (!this.getBlockStateOnLegacy().isAir()) {
+ if (true) { // Vine - lithium fast powder snow check //if (!this.getBlockStateOnLegacy().isAir()) {
int i = this.getTicksFrozen();

if (i > 0) {
- AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);
+ AttributeInstance attributemodifiable = this.getBlockStateOnLegacy().isAir() ? null : this.getAttribute(Attributes.MOVEMENT_SPEED); // Vine - lithium fast powder snow check

if (attributemodifiable == null) {
return;
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ index ee8e9c0e3690e78f3cc621ddfca89ea4256d4803..0466b04f24830539f2c927481c1c7995
}

diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a14906340a6278ee2740b6f0d1a160f8555ba13a..dbbb5db2764098d677ad730652ff43ce9e4e3ca4 100644
index 9dc412b95c4bcdb1782eeb66b09101014f3fdcf0..2ff5bc042849f3f49c9b093a4367136b78bd6103 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -542,6 +542,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
Expand Down

0 comments on commit 7198913

Please sign in to comment.