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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@efd47e3 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9188)
PaperMC/Paper@1edfefd Add option to flush region files on save (#9149)
PaperMC/Paper@9daa019 Added wither vanilla invulnerability API (#9124)
This commit is contained in:
granny
2023-05-12 22:22:02 -07:00
parent 84da84887e
commit 3325421436
79 changed files with 323 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0042-Minecart-settings-and-WASD-controls.patch
View File

@@ -5,10 +5,10 @@ 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 f5c5ed6cfb963ad2b5612fd7623d5e0f3ea058bb..48118c5121e2a2f728d2121e5206c9aa71448145 100644
index c3ce105219940d234320a415bd3050087db4778c..1224e5f2b34d32ffeb92300a1763dd6f52b3d1ce 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1069,6 +1069,7 @@ public class ServerPlayer extends Player {
@@ -1071,6 +1071,7 @@ public class ServerPlayer extends Player {
if (this.isInvulnerableTo(source)) {
return false;
} else {
@@ -17,10 +17,10 @@ index f5c5ed6cfb963ad2b5612fd7623d5e0f3ea058bb..48118c5121e2a2f728d2121e5206c9aa
if (!flag && isSpawnInvulnerable() && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) { // 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 9a80cf593bbdd7681bc9395daf4545a98e07636f..14083c591edb9a7b1eae7bd21705a7f5f0c3cbfa 100644
index ee4f924afe15c9a4d96af7a55b357076c7b28501..f774c27dd52219cd524b63cbaa1b23ad55ef849b 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
@@ -106,11 +106,13 @@ public abstract class AbstractMinecart extends Entity {
@@ -107,11 +107,13 @@ public abstract class AbstractMinecart extends Entity {
private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision
public double maxSpeed = 0.4D;
@@ -34,7 +34,7 @@ index 9a80cf593bbdd7681bc9395daf4545a98e07636f..14083c591edb9a7b1eae7bd21705a7f5
}
protected AbstractMinecart(EntityType<?> type, Level world, double x, double y, double z) {
@@ -333,6 +335,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 9a80cf593bbdd7681bc9395daf4545a98e07636f..14083c591edb9a7b1eae7bd21705a7f5
// CraftBukkit start
double prevX = this.getX();
double prevY = this.getY();
@@ -496,16 +504,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) {}