Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +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@b9b4c9a Deprecate duplicate API for arrow stuck count (#8829)
PaperMC/Paper@57f1157 Updated Upstream (Bukkit/CraftBukkit) (#8823)
This commit is contained in:
granny
2023-02-08 20:24:09 -08:00
parent 5c6a830298
commit cbb7fc002e
23 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0234-Potion-NamespacedKey.patch
View File

@@ -160,10 +160,10 @@ index 038ba61e4845a4a71bb78ba388ed249d19529b78..6d5080ba244daf3b93d61d28ee0b88eb
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index a0605955b7f3a24372dfa2c0ea6e94c47f5921eb..c041a5ddeac82548c3277e75c139f367dc81e71b 100644
index e21a20d1c4c5c40ed96fc3226dd3accceb19ebe6..c189c465f5e1266d51e4d674d56fbbe61f1c5a7e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -449,7 +449,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -455,7 +455,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@Override
public boolean addPotionEffect(PotionEffect effect, boolean force) {
@@ -172,7 +172,7 @@ index a0605955b7f3a24372dfa2c0ea6e94c47f5921eb..c041a5ddeac82548c3277e75c139f367
return true;
}
@@ -470,7 +470,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -476,7 +476,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@Override
public PotionEffect getPotionEffect(PotionEffectType type) {
MobEffectInstance handle = this.getHandle().getEffect(MobEffect.byId(type.getId()));
@@ -181,7 +181,7 @@ index a0605955b7f3a24372dfa2c0ea6e94c47f5921eb..c041a5ddeac82548c3277e75c139f367
}
@Override
@@ -482,7 +482,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -488,7 +488,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public Collection<PotionEffect> getActivePotionEffects() {
List<PotionEffect> effects = new ArrayList<PotionEffect>();
for (MobEffectInstance handle : this.getHandle().activeEffects.values()) {