9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00

Updated Upstream (Paper)

This commit is contained in:
Dreeam
2025-01-17 04:22:05 -05:00
parent e11a8420a0
commit ff0c82740a
3 changed files with 2 additions and 21 deletions

View File

@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
plugins {
java
`maven-publish`
id("io.papermc.paperweight.patcher") version "2.0.0-beta.13"
id("io.papermc.paperweight.patcher") version "2.0.0-beta.14"
}
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"

View File

@@ -44,22 +44,3 @@ index 4e414a78a6acfb90d5e212398617580a3f34be9b..883a47a9ccd75ea124d45beb1645b3f0
}
return d;
diff --git a/net/minecraft/world/entity/LivingEntity.java.rej b/net/minecraft/world/entity/LivingEntity.java.rej
new file mode 100644
index 0000000000000000000000000000000000000000..a1acc8d7b32caf3eebbbfc1a3058157b69dd74f4
--- /dev/null
+++ b/net/minecraft/world/entity/LivingEntity.java.rej
@@ -0,0 +1,13 @@
+diff a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java (rejected hunks)
+@@ -1050,10 +1050,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ }
+
+ if (entity != null) {
+- ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
+ EntityType<?> entitytypes = entity.getType();
+
+- if (entitytypes == EntityType.SKELETON && itemstack.is(Items.SKELETON_SKULL) || entitytypes == EntityType.ZOMBIE && itemstack.is(Items.ZOMBIE_HEAD) || entitytypes == EntityType.PIGLIN && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.PIGLIN_BRUTE && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.CREEPER && itemstack.is(Items.CREEPER_HEAD)) {
++ if (entitytypes == EntityType.SKELETON && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.SKELETON_SKULL) || entitytypes == EntityType.ZOMBIE && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.ZOMBIE_HEAD) || entitytypes == EntityType.PIGLIN && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.PIGLIN_HEAD) || entitytypes == EntityType.PIGLIN_BRUTE && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.PIGLIN_HEAD) || entitytypes == EntityType.CREEPER && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.CREEPER_HEAD)) { // Gale - Petal - reduce skull ItemStack lookups for reduced visibility
+ d0 *= 0.5D;
+ }
+ }

View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4
paperRef=9f74858760f8fbb9e8a231dc8c698f1a7855599a
paperRef=b1b88cd31687c5b3f80c4b0b51fd93a63b3e2498
org.gradle.configuration-cache=true
org.gradle.caching=true