Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18: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:
2780e94 Fix PaperTickList (#6241)
b854e7e Drop unneeded patch (#6240)
2961b2a Fix various mob drops being captured as death drops (#5675)
3801a39 Add ItemRarity test (#6247)
170382f Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
This commit is contained in:
William Blake Galbreath
2021-07-23 10:55:13 -05:00
parent 0dad40ac19
commit dd259870b0
24 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0082-Entity-lifespan.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..76471484a47b2b6ff5293fe2b6afe1d5cd5aece0 100644
index 13b91cdd6d63097355eb11a3f6d5d9695e710e13..de61f919380308f48c28ab2027077875f1e182e7 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -126,6 +126,7 @@ public abstract class Mob extends LivingEntity {
@@ -16,7 +16,7 @@ index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..76471484a47b2b6ff5293fe2b6afe1d5
public boolean aware = true; // CraftBukkit
protected Mob(EntityType<? extends Mob> type, Level world) {
@@ -279,6 +280,7 @@ public abstract class Mob extends LivingEntity {
@@ -283,6 +284,7 @@ public abstract class Mob extends LivingEntity {
entityliving = null;
}
}
@@ -24,7 +24,7 @@ index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..76471484a47b2b6ff5293fe2b6afe1d5
this.target = entityliving;
return true;
// CraftBukkit end
@@ -323,9 +325,35 @@ public abstract class Mob extends LivingEntity {
@@ -327,9 +329,35 @@ public abstract class Mob extends LivingEntity {
this.playAmbientSound();
}
@@ -60,7 +60,7 @@ index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..76471484a47b2b6ff5293fe2b6afe1d5
@Override
protected void playHurtSound(DamageSource source) {
this.resetAmbientSoundTime();
@@ -509,6 +537,7 @@ public abstract class Mob extends LivingEntity {
@@ -513,6 +541,7 @@ public abstract class Mob extends LivingEntity {
}
nbt.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
@@ -68,7 +68,7 @@ index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..76471484a47b2b6ff5293fe2b6afe1d5
}
@Override
@@ -579,6 +608,11 @@ public abstract class Mob extends LivingEntity {
@@ -583,6 +612,11 @@ public abstract class Mob extends LivingEntity {
this.aware = nbt.getBoolean("Bukkit.Aware");
}
// CraftBukkit end
@@ -80,7 +80,7 @@ index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..76471484a47b2b6ff5293fe2b6afe1d5
}
@Override
@@ -1584,6 +1618,7 @@ public abstract class Mob extends LivingEntity {
@@ -1590,6 +1624,7 @@ public abstract class Mob extends LivingEntity {
this.setLastHurtMob(target);
}