Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-19 14:59:32 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2024-03-15 14:00:14 +08:00
parent dcb9e0708b
commit 1ae6c790f4
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -16,7 +16,7 @@ repositories {
} }
dependencies { dependencies {
remapper("net.fabricmc:tiny-remapper:0.8.10:fat") remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
decompiler("net.minecraftforge:forgeflower:2.0.627.2") decompiler("net.minecraftforge:forgeflower:2.0.627.2")
paperclip("top.leavesmc:leavesclip:1.0.2") paperclip("top.leavesmc:leavesclip:1.0.2")
} }

2
gradle.properties
View File

@@ -4,6 +4,6 @@ version=1.20.4-R0.1-SNAPSHOT
mcVersion=1.20.4 mcVersion=1.20.4
packageVersion=1_20_R3 packageVersion=1_20_R3
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
paperRef=6ad63fba30e7ecd1b11bb8d77e8ed43f0a6e9ce9 paperRef=62b220a87f6991c33423346e5f50e64058e7bdd9
preVersion=false preVersion=false
updatingMinecraft=false updatingMinecraft=false

4
patches/server/0064-Creative-fly-no-clip.patch
View File

@@ -99,7 +99,7 @@ index 5c311270a39f6b4996c8b58822d24556c67adc41..cb40179236952edcc1678a58a5886b19
} }
} }
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
index 54f7bdd0e003ed170d739593199a2bb8ff0bbd68..1193c4809d551c12329c7f4b380a134609cbe85d 100644 index 098fde8200a11f91f934ddab6b1486dac4014dfe..88c9097368f7a842e1d31c460330aa3d267676ef 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
@@ -18,6 +18,7 @@ import net.minecraft.util.Mth; @@ -18,6 +18,7 @@ import net.minecraft.util.Mth;
@@ -110,7 +110,7 @@ index 54f7bdd0e003ed170d739593199a2bb8ff0bbd68..1193c4809d551c12329c7f4b380a1346
import net.minecraft.world.entity.projectile.ThrownEnderpearl; import net.minecraft.world.entity.projectile.ThrownEnderpearl;
import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.ChunkPos;
@@ -128,7 +129,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { @@ -121,7 +122,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
} }
public static boolean canEntityTeleport(Entity entity) { public static boolean canEntityTeleport(Entity entity) {

20
patches/server/0107-Fix-vehicle-teleport-by-end-gateway.patch
View File

@@ -5,15 +5,15 @@ Subject: [PATCH] Fix vehicle teleport by end gateway
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
index 1193c4809d551c12329c7f4b380a134609cbe85d..96f323b1ce7ffa0e1a4c58b39da1f01a356310ad 100644 index 88c9097368f7a842e1d31c460330aa3d267676ef..7b626bc319eeebff6f0165db0eb0fd6c70d8cc36 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
@@ -109,7 +109,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { @@ -221,7 +221,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
if (!list.isEmpty()) {
// Paper start - Ensure safe gateway teleport entity1.setPortalCooldown();
for (Entity entity : list) { ((ServerPlayer) entity1).connection.teleport(teleEvent.getTo());
- if (entity.canChangeDimensions()) { - entity1.teleportPassengers(); // Paper - teleport passengers as well, preventing invisible passengers post teleport.
+ if (true || entity.canChangeDimensions()) { // Leaves - be vanilla + // entity1.teleportPassengers(); // Paper - teleport passengers as well, preventing invisible passengers post teleport. // Leaves - vanilla
TheEndGatewayBlockEntity.teleportEntity(world, pos, state, entity, blockEntity); TheEndGatewayBlockEntity.triggerCooldown(world, pos, state, blockEntity); // CraftBukkit - call at end of method
break; return;
}

6
patches/server/0114-Force-Void-Trade.patch
View File

@@ -188,10 +188,10 @@ index 02feea12c998f37098b72becf6bfaf6b27d155de..b0ac4dcb539c3286a0c79ce7322f8cb8
public void setToOutOfStock() { public void setToOutOfStock() {
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
index 96f323b1ce7ffa0e1a4c58b39da1f01a356310ad..d335ceecd60810479b49c2a36035605087173a98 100644 index 7b626bc319eeebff6f0165db0eb0fd6c70d8cc36..e9069275d038e7b5a15c4f85dae6dbc4851ba374 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
@@ -226,6 +226,16 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { @@ -219,6 +219,16 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
return; return;
} }
@@ -207,4 +207,4 @@ index 96f323b1ce7ffa0e1a4c58b39da1f01a356310ad..d335ceecd60810479b49c2a360356050
+ +
entity1.setPortalCooldown(); entity1.setPortalCooldown();
((ServerPlayer) entity1).connection.teleport(teleEvent.getTo()); ((ServerPlayer) entity1).connection.teleport(teleEvent.getTo());
TheEndGatewayBlockEntity.triggerCooldown(world, pos, state, blockEntity); // CraftBukkit - call at end of method // entity1.teleportPassengers(); // Paper - teleport passengers as well, preventing invisible passengers post teleport. // Leaves - vanilla