Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Purpur)

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

Purpur Changes:
PurpurMC/Purpur@8c8c18b Updated Upstream (Paper)
This commit is contained in:
github-actions[bot]
2023-03-12 20:54:30 +00:00
parent 43894dca15
commit 037dc5bbae
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 05:50:00 +0000
Date: Sun, 12 Mar 2023 20:49:53 +0000
Subject: [PATCH] Pufferfish Server Changes
Original: Kevin Raneri <kevin.raneri@gmail.com>
@@ -2125,7 +2125,7 @@ index 41ff954010c11d524ffb90abd22c29a1d8d8f5a0..ac7ee31f2bfe5d4139b793a698317db5
private String descriptionId;
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 42eb78830855d7282b7f3f1bdbe85e632d489784..413652284e229a51e3eefe47f239e8fa9a09ccb2 100644
index 902a19def9d902e7bfb476688354a070633a3454..f0acc1fd51a49589c33c089562ac80053b4c1ef9 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;

4
patches/server/0002-Purpur-Server-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Sun, 12 Mar 2023 05:51:48 +0000
Date: Sun, 12 Mar 2023 20:51:35 +0000
Subject: [PATCH] Purpur Server Changes
Original: PurpurMC
@@ -4630,7 +4630,7 @@ index c1e9b40a4a0f9cdc650caa88b5ea132e06ee2496..5d6cddc221887be20ef75d688817dfe5
@Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 413652284e229a51e3eefe47f239e8fa9a09ccb2..b2e4b5c463ceb19356da18e7fc52d20801b674cd 100644
index f0acc1fd51a49589c33c089562ac80053b4c1ef9..cc8de71037a1eb5dc08467f9bfb84d5abb40b7df 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -221,9 +221,9 @@ public abstract class LivingEntity extends Entity {