mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 21faf822 Implement optional per player mobspawning (#2171) 88722ec8 Prevent consuming the wrong itemstack (#2477) 294e3046 Async chunk api/io/loading (#2308)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 40f4abacffd4ecc60352c26a17dd7dd218fb5af6 Mon Sep 17 00:00:00 2001
|
||||
From 95fe8b962045f2eb4d58ec8d87dce9323403c5b5 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 25 Jul 2019 18:07:37 -0500
|
||||
Subject: [PATCH] Implement elytra settings
|
||||
@@ -13,7 +13,7 @@ Subject: [PATCH] Implement elytra settings
|
||||
6 files changed, 50 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index bc701552e..757b47b80 100644
|
||||
index b4230fcc4..213683674 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -2592,9 +2592,16 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -36,7 +36,7 @@ index bc701552e..757b47b80 100644
|
||||
}
|
||||
} else {
|
||||
flag = false;
|
||||
@@ -3236,6 +3243,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -3240,6 +3247,7 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,5 +145,5 @@ index 7ff20fe08..b1dcb5f8d 100644
|
||||
+ }
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.23.0.rc1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user