Skip to content

Commit

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

Gale Changes:
Dreeam-qwq/Gale@09bee62 Temp drop Cache ominous banner item
  • Loading branch information
Dreeam-qwq committed Aug 5, 2024
1 parent bcd5cb4 commit 1d71734
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = cn.dreeam.leaf
mcVersion = 1.21
version = 1.21-R0.1-SNAPSHOT

galeCommit = d007b8486e54e7a2e7b640915016f051aad5fbf2
galeCommit = 09bee62de97e548dd8b3a090db5c4bd6acaf1e23

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0011-Purpur-Server-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12763,7 +12763,7 @@ index 55fd997a4e894eeab24de269d59e486196ffbe8d..999453409c19abf7f5b5c2dc39969985
public boolean hurt(DamageSource source, float amount) {
return false;
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
index 9c958635f9b9ca82d49062fdc35b7ebadf02bb2f..6e20ab54278ab3aa66dc8762c7e6a538ddf9cc9b 100644
index bbf21ea433f9e3963aac0ede597ed8d3c8e50ed8..06487fc9ea416d8256e0c2cd1969d4e0283ffb05 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
+++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
@@ -299,7 +299,7 @@ public abstract class Raider extends PatrollingMonster {
Expand All @@ -12774,7 +12774,7 @@ index 9c958635f9b9ca82d49062fdc35b7ebadf02bb2f..6e20ab54278ab3aa66dc8762c7e6a538
+ if ((!this.mob.level().purpurConfig.pillagerBypassMobGriefing && !this.mob.level().getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING)) || !this.mob.canPickUpLoot()) return false; // Paper - respect game and entity rules for picking up items // Purpur
Raid raid = this.mob.getCurrentRaid();

if (this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && this.mob.canBeLeader() && !ItemStack.matches(this.mob.getItemBySlot(EquipmentSlot.HEAD), Raid.getLeaderBanner(this.mob.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) { // Gale - Lithium - cache ominous banner item
if (this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && this.mob.canBeLeader() && !ItemStack.matches(this.mob.getItemBySlot(EquipmentSlot.HEAD), Raid.getLeaderBannerInstance(this.mob.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) {
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raids.java b/src/main/java/net/minecraft/world/entity/raid/Raids.java
index 8c60f71270d909c10e6617eb64b8fdb42deb73e9..eedce2a3d67d875d5174ee125e2679480d4d412c 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raids.java
Expand Down

0 comments on commit 1d71734

Please sign in to comment.