Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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@0193a9d Add EntityPortalReadyEvent (#5619)
PaperMC/Paper@4952c04 Don't use level random in entity constructors (#8122)
PaperMC/Paper@1a8bea7 Fix wrong world being passed into portal event (#8174)
This commit is contained in:
BillyGalbreath
2022-07-22 20:52:13 -05:00
parent 697c83e324
commit a60a01188e
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0069-Item-entity-immunities.patch
View File

@@ -18,7 +18,7 @@ index 871bce7f5acc1b9a058496f41d962ec2e724f620..9bfd1cb300fe7f76e9a36167390ab1c2
public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
this.trackedPlayers = trackedPlayers;
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index 64c8eefa0302b04b416cd4912c01c50feddf1301..99176a781a5e375c71197546222e2b6f85544f47 100644
index 68c88e91ceb1fb19d2b3c168e56d7a4314232d64..8d38eac6316dedc94dc257e6dabfd704c0311caa 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -55,6 +55,12 @@ public class ItemEntity extends Entity {
@@ -34,7 +34,7 @@ index 64c8eefa0302b04b416cd4912c01c50feddf1301..99176a781a5e375c71197546222e2b6f
public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
super(type, world);
@@ -334,6 +340,15 @@ public class ItemEntity extends Entity {
@@ -339,6 +345,15 @@ public class ItemEntity extends Entity {
return false;
} else if (!this.getItem().getItem().canBeHurtBy(source)) {
return false;
@@ -50,7 +50,7 @@ index 64c8eefa0302b04b416cd4912c01c50feddf1301..99176a781a5e375c71197546222e2b6f
} else if (this.level.isClientSide) {
return true;
} else {
@@ -519,6 +534,12 @@ public class ItemEntity extends Entity {
@@ -524,6 +539,12 @@ public class ItemEntity extends Entity {
this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty
this.despawnRate = level.paperConfig().entities.spawning.altItemDespawnRate.enabled ? level.paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), level.spigotConfig.itemDespawnRate) : level.spigotConfig.itemDespawnRate; // Paper