Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ff26d54 send sound and particle packets immediately even if off main (#10033)
PaperMC/Paper@e3140fb hotfix spawning item/xp in wrong spot
PaperMC/Paper@0b95298 Make worldborder collisions consistent with Vanilla
This commit is contained in:
granny
2023-12-18 18:30:41 -08:00
parent eb3b67d5b2
commit cfd98b844d
16 changed files with 52 additions and 52 deletions

View File

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 9907c10091b0f02c43cfd2d4b0d0953b91cbb070..da036cb4be83301a22c9f5af9c7f1439a9347799 100644
index 77ada6859c6fcc6929be5da350ac0f483dd1ae00..63c195ece6a96940bc059251bb40ab9129196fe1 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1863,7 +1863,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1858,7 +1858,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
return this.isInWater() || flag;
}