Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@236a296 Add LivingEntity#swingHand(EquipmentSlot) convenience method (#8456)
  • Loading branch information
actions-user committed Oct 16, 2022
1 parent f22b6fc commit 379e9da
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group = net.prismarineteam.prismarine
version = 1.19.2-R0.1-SNAPSHOT

paperCommit = ec00f991a459c1f747648d18da84263a81efda98
paperCommit = 236a29623c979a6c97e1029fe8d1448d42f6d226

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
8 changes: 4 additions & 4 deletions patches/api/0002-Purpur-API-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1172,12 +1172,12 @@ index d0bef15785493b512ff0f7414c1d58d38fead581..fd213c026fdfb3030d0c37f651a88857
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 4af5e8d0cba6555f7615e4e809d9aff221c0dc4d..4a4606f2598b868e43c270cd3056d44549bc914e 100644
index 319e4571aca24d1e3f6c85b7435d65c0e77a5245..510d72bb5805ae14715282d21d790d251be21dd2 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -986,4 +986,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setHurtDirection(float hurtDirection);
@@ -1004,4 +1004,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
}
}
// Paper end
+
+ // Purpur start
Expand Down

0 comments on commit 379e9da

Please sign in to comment.