Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper) (#1169)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0046-Minecart-settings-and-WASD-controls.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Minecart settings and WASD controls
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 671ef13c7abdd77ad49fc490c2117a224b701311..80598d109eba14f719c4c8190d93d4a9febb9248 100644
index a907475add800f1f47e647b169d6b709acefc785..4ff8022c0787575b215f03b142c908a8076618eb 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1035,6 +1035,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 671ef13c7abdd77ad49fc490c2117a224b701311..80598d109eba14f719c4c8190d93d4a9
if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
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 3f31a3c17ecca6e93b794478129b95ecff4e1a9c..d2d1e554b1c24df982ff28fbe118229c8e9ecd13 100644
index c71120fe57a76c4638be5dcbda5a756cc2d62ffc..997776ac62d2de1f076a5bc38fcf78a1999748cf 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
@@ -107,11 +107,13 @@ public abstract class AbstractMinecart extends Entity {
@@ -34,7 +34,7 @@ index 3f31a3c17ecca6e93b794478129b95ecff4e1a9c..d2d1e554b1c24df982ff28fbe118229c
}
protected AbstractMinecart(EntityType<?> type, Level world, double x, double y, double z) {
@@ -326,6 +328,12 @@ public abstract class AbstractMinecart extends Entity {
@@ -334,6 +336,12 @@ public abstract class AbstractMinecart extends Entity {
@Override
public void tick() {
@@ -47,7 +47,7 @@ index 3f31a3c17ecca6e93b794478129b95ecff4e1a9c..d2d1e554b1c24df982ff28fbe118229c
// CraftBukkit start
double prevX = this.getX();
double prevY = this.getY();
@@ -489,16 +497,63 @@ public abstract class AbstractMinecart extends Entity {
@@ -497,16 +505,63 @@ public abstract class AbstractMinecart extends Entity {
public void activateMinecart(int x, int y, int z, boolean powered) {}