mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b36b49ac Don't create direct holder for structures in World#locateNearestStructure (#13432) PaperMC/Paper@1d3d8206 Don't print missing profile stacktrace (#13420) PaperMC/Paper@8b35361f Add UnsafeValues#deserializeItemHover (#13067) PaperMC/Paper@f7840d62 fix: bump netty-codec-haproxy in order to match mojang's bump in mc netty deps (#13403) PaperMC/Paper@3f07f021 Make arrow despawn rate override configurable (#13409) PaperMC/Paper@6aa085b8 Raid max Groups configurable by API (#12896) PaperMC/Paper@e06e691a Fix inverted check in PiglinAi#pickUpItem (#13419) PaperMC/Paper@2a8353a0 Fix display's glow color override interpreting alpha channel (#13441)
This commit is contained in:
@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
|
|||||||
|
|
||||||
mcVersion = 1.21.11
|
mcVersion = 1.21.11
|
||||||
apiVersion=1.21.11
|
apiVersion=1.21.11
|
||||||
paperCommit = 6da8af7ca4e29f4ea6961905a96d9f244980c932
|
paperCommit = 2a8353a00b2d4a3c045954a899f650cf616b4a0c
|
||||||
|
|
||||||
org.gradle.configuration-cache = true
|
org.gradle.configuration-cache = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/world/entity/monster/piglin/PiglinAi.java
|
--- a/net/minecraft/world/entity/monster/piglin/PiglinAi.java
|
||||||
+++ b/net/minecraft/world/entity/monster/piglin/PiglinAi.java
|
+++ b/net/minecraft/world/entity/monster/piglin/PiglinAi.java
|
||||||
@@ -667,13 +_,23 @@
|
@@ -660,13 +_,23 @@
|
||||||
|
|
||||||
public static boolean isWearingSafeArmor(LivingEntity entity) {
|
public static boolean isWearingSafeArmor(LivingEntity entity) {
|
||||||
for (EquipmentSlot equipmentSlot : EquipmentSlotGroup.ARMOR) {
|
for (EquipmentSlot equipmentSlot : EquipmentSlotGroup.ARMOR) {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
protected AbstractArrow(EntityType<? extends AbstractArrow> type, Level level) {
|
protected AbstractArrow(EntityType<? extends AbstractArrow> type, Level level) {
|
||||||
super(type, level);
|
super(type, level);
|
||||||
@@ -359,7 +_,7 @@
|
@@ -362,7 +_,7 @@
|
||||||
this.setInGround(false);
|
this.setInGround(false);
|
||||||
Vec3 deltaMovement = this.getDeltaMovement();
|
Vec3 deltaMovement = this.getDeltaMovement();
|
||||||
this.setDeltaMovement(deltaMovement.multiply(this.random.nextFloat() * 0.2F, this.random.nextFloat() * 0.2F, this.random.nextFloat() * 0.2F));
|
this.setDeltaMovement(deltaMovement.multiply(this.random.nextFloat() * 0.2F, this.random.nextFloat() * 0.2F, this.random.nextFloat() * 0.2F));
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean isInGround() {
|
public boolean isInGround() {
|
||||||
@@ -582,6 +_,12 @@
|
@@ -585,6 +_,12 @@
|
||||||
public @Nullable ItemStack getWeaponItem() {
|
public @Nullable ItemStack getWeaponItem() {
|
||||||
return this.firedFromWeapon;
|
return this.firedFromWeapon;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -1933,6 +_,52 @@
|
@@ -1932,6 +_,52 @@
|
||||||
return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
|
return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user