Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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@f75636b [ci skip] Update my name in author field (#6625)
PaperMC/Paper@d2c2b7a Implement Translatable on villager Profession (#6542)
PaperMC/Paper@9087993 Mark fish and axolotls from buckets as persistent (#6392)
PaperMC/Paper@aad7d37 Fix axolotl/fish persistence
PaperMC/Paper@6084ac3 Fix upstream nullability on entity equipment getters (#6519)
PaperMC/Paper@655cd8f Fix upstreams fix for composters and variable hoppers (#6563)
PaperMC/Paper@7ac51f9 Include slot when constructing the bukkit Attribute Modifiers (#6537)
PaperMC/Paper@caa4780 Add more component name methods (#6578)
PaperMC/Paper@9460497 Apply furnace cook speed multiplier through event (#6378)
PaperMC/Paper@f4f5a76 Fix anvil inventory events (#6157)
PaperMC/Paper@1707c10 fixes cancelling PlayerTradeEvent (#5612)
This commit is contained in:
granny
2021-09-23 13:10:23 -07:00
parent 3b75acda59
commit acb8a26d9a
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0001-Airplane-Server-Changes.patch
View File

@@ -2396,7 +2396,7 @@ index 153194d937d210e2e4fd8864e4a3c000f85d7e2e..1d415a91b9c90603e8f738dbafe7a5ea
@Override
protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index fa365420a4593bc7d652b0d92f4750602fcb334b..9c4bf9b66e97d06e17e008784feda1a192a81b00 100644
index 0c616bd9309d304727a29ff5cb1c60d9f031b34c..b67562ea0ba8dc5c3fb26b3e79b89e0b3fd69631 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -275,9 +275,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -3068,7 +3068,7 @@ index 52de9852f87d346714a950b60a0004d386ac10f0..86bbd9fcee5982cf901ef0480052025c
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index d41851f9119c334cae3fc2c433d6450a3eed9096..97061e93c4a3b6ffcd15f07284a31dd17739837c 100644
index 4950d49ed414e1c82c125b9347113f595f1078b6..f9b0956ea73cee2f97c22c5ed2fa42546278a650 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -44,7 +44,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -3170,7 +3170,7 @@ index d41851f9119c334cae3fc2c433d6450a3eed9096..97061e93c4a3b6ffcd15f07284a31dd1
if (itemstack1.isEmpty()) {
// Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
@@ -731,7 +763,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -733,7 +765,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@Override
protected void setItems(NonNullList<ItemStack> list) {

10
patches/server/0007-Ridables.patch
View File

@@ -86,7 +86,7 @@ index 7a7ce8f3ad0bbcbf926718bd46e9dccee08a0778..88227a0882b4a667206891b2a26ad576
if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 033ef002588881985a22e9990adb09fa56b28106..530d3e8c0377593e973fad65b98f9f484e1ca3bd 100644
index 518a8b1e165d49350931dfaefa6cef01729c7f92..6e1ec12480207e4cec269ee1a07f920fc1ae67ad 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -573,7 +573,7 @@ index 1d415a91b9c90603e8f738dbafe7a5ea57ef14cc..e0a55fdff847180d08db0bc6bc7e1928
BlockPos blockposition = this.blockPosition();
BlockPos blockposition1 = blockposition.above();
diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
index fc0cd86397b12e42756273a0317164d79ac51937..4243c4d3479210e392a1246337a3daabee5629d7 100644
index 0701adf77a04a82df4fe1dceee196fee5d820961..d5ae347e33ca354cae36db09dbc4ada78341e13e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
+++ b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
@@ -108,12 +108,9 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
@@ -2012,7 +2012,7 @@ index 80caabee4d2100208f117a1c3e35247b65e318ad..bca3300e06d6eb0c6acdfb11d715a1e8
this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers(new Class[0])); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index 9c4bf9b66e97d06e17e008784feda1a192a81b00..f0f1a286011bded016897cc8a0783a8a49a43b33 100644
index b67562ea0ba8dc5c3fb26b3e79b89e0b3fd69631..861f9f58c8ff13edf8f70083e76b854bc6fc2cd9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -90,6 +90,23 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -5717,10 +5717,10 @@ index 0000000000000000000000000000000000000000..8eefb7b7eb33aecf48ac206d3f0139e0
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 0e1dcfdf846f978340380352e092375ffa089cb0..7c51a6113bbf35f96693daf2988b6d59e53cbca1 100644
index b4e08dcdf2d94935b58eb90c7ff84511ef525f52..f6b01c77f9af6a824fcb727a9dbae1dd136181d8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1239,4 +1239,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1250,4 +1250,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return getHandle().isTicking();
}
// Paper end

6
patches/server/0156-Add-unsafe-Entity-serialization-API.patch
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/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 9430d4e270cd5ebabeffde0e28f0a96657ce0262..c50089b21d3b258ae4b3f0a6b2625fb129764fee 100644
index 5a12ca0a556da2d67f58dcb2466eafe5237671db..b290df0ac4951abeade7b6b038fe5f963060d425 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1265,5 +1265,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1276,5 +1276,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public boolean isRidableInWater() {
return getHandle().rideableUnderWater();
}
@@ -34,7 +34,7 @@ index 9430d4e270cd5ebabeffde0e28f0a96657ce0262..c50089b21d3b258ae4b3f0a6b2625fb1
// Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 72cfffd80ad76abe7cb16bc9133730338c07b6f6..09b99e3465ae142081f01c483116c1d1adb34842 100644
index 408863b137b7bda3f3e654ac3665ddeefb6d9e7b..1a3170810dacc3017dc16c2dd2ceca3d40023b2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -407,9 +407,14 @@ public final class CraftMagicNumbers implements UnsafeValues {

6
patches/server/0204-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 487fd05a2d5946b7f0325b81dce1f8acf28f0db4..4f23021c353c926f92d0403b9c9c383b7300db1c 100644
index 585054a070701d7ca3edd386ec7ef8627e093797..d7ff6944c39a1ec8ec06ccb9e2c5c2aff068beaa 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4376,5 +4376,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -333,10 +333,10 @@ index 1f90c40c5e92232c38a33097903fd6e2f6f2ff02..39fa4a9a52c510e88036ab790a8739d2
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index c50089b21d3b258ae4b3f0a6b2625fb129764fee..ce85691da804b62591f65e993206a873e84c1f8c 100644
index b290df0ac4951abeade7b6b038fe5f963060d425..f42cba9262902c9e3940464418e73fcc8d9e0627 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1272,5 +1272,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1283,5 +1283,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
entity.absMoveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
return !entity.valid && entity.level.addEntity(entity, spawnReason);
}