Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

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@fa4de12 Make block events follow upstream logic
MultiPaper/ShreddedPaper@11260a5 handlingTick
  • Loading branch information
404Setup committed Aug 3, 2024
1 parent 861e35d commit efebe26
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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.levelpowered.vine
version = 1.20.6-R0.1-SNAPSHOT
mcVersion = 1.20.6

spRef = 7aa6d7c42fdcd71d541ebacd39f3d0c9dbdcef7f
spRef = 11260a5eb86f5beca5a3e8d312581871d759c5f5

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0003-Leaf-Optimize-Minecart-collisions.patch
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ index f1b9e83206cc67e6ef29ebe088351b0aaa5eb349..e0a51e269aa076def275710174d3654d
Team.CollisionRule scoreboardteambase_enumteampush = scoreboardteam == null ? Team.CollisionRule.ALWAYS : scoreboardteam.getCollisionRule();

diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
index de2ea35a226c5f595a2ab53beda8238a806c2bad..30d756aee64e0215540f27b6d75d29ca03d6823a 100644
index de2ea35a226c5f595a2ab53beda8238a806c2bad..bfc4a4b3dcccdef3a3a5036716adf4e01cf641b2 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
@@ -386,15 +364,16 @@ public abstract class AbstractMinecart extends VehicleEntity {
@@ -386,15 +386,16 @@ public abstract class AbstractMinecart extends VehicleEntity {
this.level().getCraftServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleMoveEvent(vehicle, from, to));
}
// CraftBukkit end
Expand All @@ -53,7 +53,7 @@ index de2ea35a226c5f595a2ab53beda8238a806c2bad..30d756aee64e0215540f27b6d75d29ca
if (!(entity instanceof Player) && !(entity instanceof IronGolem) && !(entity instanceof AbstractMinecart) && !this.isVehicle() && !entity.isPassenger()) {
// CraftBukkit start
VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity.getBukkitEntity());
@@ -421,21 +400,19 @@ public abstract class AbstractMinecart extends VehicleEntity {
@@ -421,21 +422,19 @@ public abstract class AbstractMinecart extends VehicleEntity {
}
}
} else {
Expand Down

0 comments on commit efebe26

Please sign in to comment.