Updated Upstream (Paper) (#1169)

This commit is contained in:
frog-commits
2022-10-24 00:46:53 -04:00
committed by GitHub
parent e35f48112e
commit 74b72a5f42
23 changed files with 137 additions and 172 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable powered rail boost modifier
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 d2d1e554b1c24df982ff28fbe118229c8e9ecd13..b16ad4d5f3cdf8e0e44f74ae481b04d38e7a6c9e 100644
index 997776ac62d2de1f076a5bc38fcf78a1999748cf..2cf873bffe06bc6905eebf8be243609cf43d7dd4 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
@@ -715,7 +715,7 @@ public abstract class AbstractMinecart extends Entity {
@@ -723,7 +723,7 @@ public abstract class AbstractMinecart extends Entity {
if (d18 > 0.01D) {
double d20 = 0.06D;
@@ -18,7 +18,7 @@ index d2d1e554b1c24df982ff28fbe118229c8e9ecd13..b16ad4d5f3cdf8e0e44f74ae481b04d3
Vec3 vec3d5 = this.getDeltaMovement();
double d21 = vec3d5.x;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cd64916a3e47760b2046a34c3b9ec97d491d65a2..d6b680924535ff43b6a6e078efedceda45131a53 100644
index 8d4dc7d526cf9f4ec05e845ec9b10a47ff422d1e..9973dbee6ea493d7a4f70ac6627abd69123ab622 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -274,6 +274,7 @@ public class PurpurWorldConfig {