Skip to content

Commit

Permalink
Readd Leaves: Fix vehicle teleport by end gateway
Browse files Browse the repository at this point in the history
  • Loading branch information
Dreeam-qwq committed Mar 26, 2024
1 parent 9ded554 commit 300d3f2
Show file tree
Hide file tree
Showing 44 changed files with 58 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: violetc <[email protected]>
Date: Tue, 15 Aug 2023 22:40:42 +0800
Subject: [PATCH] Leaves: Fix vehicle teleport by end gateway

Original license: GPLv3
Original project: https://github.com/LeavesMC/Leaves

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 5717b1c2fd5b16d439499296edd35d72b6613212..2cc37cf1c3e8f7c8fdd6c1b9cfad02283f8f1dec 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
@@ -229,7 +229,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {

entity1.setPortalCooldown();
((ServerPlayer) entity1).connection.teleport(teleEvent.getTo());
- entity1.teleportPassengers(); // Paper - teleport passengers as well, preventing invisible passengers post teleport.
+ if (!org.dreeam.leaf.config.modules.gameplay.UseVanillaEndTeleport.enabled) entity1.teleportPassengers(); // Paper - teleport passengers as well, preventing invisible passengers post teleport. // Leaf - Leaves - vanilla
TheEndGatewayBlockEntity.triggerCooldown(world, pos, state, blockEntity); // CraftBukkit - call at end of method
return;

diff --git a/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseVanillaEndTeleport.java b/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseVanillaEndTeleport.java
new file mode 100644
index 0000000000000000000000000000000000000000..778f428eaaf22236e52aa4b670f5ec34996ea862
--- /dev/null
+++ b/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseVanillaEndTeleport.java
@@ -0,0 +1,27 @@
+package org.dreeam.leaf.config.modules.gameplay;
+
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+import org.dreeam.leaf.config.ConfigInfo;
+import org.dreeam.leaf.config.EnumConfigCategory;
+import org.dreeam.leaf.config.IConfigModule;
+
+public class UseVanillaEndTeleport implements IConfigModule {
+
+ @Override
+ public EnumConfigCategory getCategory() {
+ return EnumConfigCategory.GAMEPLAY;
+ }
+
+ @Override
+ public String getBaseName() {
+ return "use_vanilla_end_teleport";
+ }
+
+ @ConfigInfo(baseName = "enabled")
+ public static boolean enabled = false;
+
+ @Override
+ public void onLoaded(CommentedFileConfig config) {
+ config.setComment("gameplay.use_vanilla_end_teleport", "Enable to Use Vanilla End Gateway Teleport");
+ }
+}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Sync with Gale's Optimize-sun-burn-tick.patch


diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 1952c66202f51bdbca52fab03710ca0d76e0312d..98e673534927255b20f73238f6c213f256ec1694 100644
index 1f8ca7bc71992d287dac964d0528e15bd39bfe3c..4bf569b6b81701ea2d45d090438686c5dbbd1744 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -568,13 +568,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This format saves about 50% of disk space.
Documentation: https://github.com/xymb-endcrystalme/LinearRegionFileFormatTools

diff --git a/build.gradle.kts b/build.gradle.kts
index b1fd42d66874f29428a22570059f07696b487d5e..9d7cc530187263c6a4ed99df2c79d66d76749cc6 100644
index f90321a70982e2a011f330968483ff1d12164e1b..5c14f2a186509e9f4a7a525320cc7492be939b7c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,6 +32,8 @@ dependencies {
Expand Down Expand Up @@ -118,7 +118,7 @@ index 8dffb330b474b830d2f816ecf8be2e8d2e4556cd..bed46642b59d38e58e6aa663a47cbfc9
long expectedChunks = (long)regionFiles.length * (32L * 32L);
// Gale start - instantly continue on world upgrade finish
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6da8bd049f3a9838383864df03a042b996f8e8a9..754fff2c0305f2bf5ce1d080f0f0d9128a0fbb2e 100644
index 2544c8022ed0fdebc407fc85350041d77247d168..78b787edacb65496eb7d84b452dc637deaa094e4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -866,7 +866,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Redirect to Gale's method to fix plugin incompatibility


diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index ca48897b65cf5629fe42f9ea9550bc015a213031..d3a31ca2b926fe809d84cc8b28767c1c69896fe4 100644
index 861c316db5e86b3939bd7259be81575d6351838e..e11de0bca95fe380b58553e1d963fd3687769a91 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -251,6 +251,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 300d3f2

Please sign in to comment.