Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issues (#1530)

Browse Source
This commit is contained in:
Krakenied
2024-06-17 01:52:10 +02:00
committed by GitHub
parent 6e1147f1ac
commit c9917352de
306 changed files with 1065 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0119-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -110,7 +110,7 @@ index 3d61c2d5da103de68242c16d85c703813979d179..2343325fa9a771de7b9445cda24a2bcd
public ItemStack getBucketItemStack() {
return new ItemStack(Items.COD_BUCKET);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
index 06014b84e99ce2e8c019de921891590e151b2c56..c519883f4ed3772378b5563401b8c557dc315ace 100644
index bf7ea4da6bd047b54e86b1853b9dad714a6e5e16..dfb8bc50ceb8eab6752fab62cb81efda569d2fbb 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -71,6 +71,11 @@ public class Cow extends Animal {
@@ -222,7 +222,7 @@ index 925bed4503a4023c01d8b9ffd07047831e5e96e5..6ea8ecf8672b71533c9b979a3d46bd94
public boolean canTakeItem(ItemStack stack) {
EquipmentSlot enumitemslot = this.getEquipmentSlotForItem(stack);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
index d2cdb2d14dc8fe3cf6ffb14668f848e5dd020827..aefb5624409e7c31944d897d52f3a71ea85e1923 100644
index 13259f5f00aa0fc12254b954c3e21f19198bed8e..ef16a21ec3626a0db0b2d0ed3cdf1acc16212f43 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
@@ -196,6 +196,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -347,7 +347,7 @@ index cdb6657d30d224709aec3921c5fb8380f8acd93e..9f20eae7449c670b913cc3bbe1a89254
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
index b4cb9fc3f543b70233fe88a31565252eefdb4ce9..7092070b8f540ad34b92ac6d4fc9feaca4bd296d 100644
index 8ed02b9737c47a19aa6a38789c19947e7aae36a3..cefdf05e5aa8c69309747559ec164c116a95dd88 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -87,6 +87,11 @@ public class Squid extends WaterAnimal {
@@ -571,7 +571,7 @@ index b078d1922db9f0db561d6e824794bc4518a44947..6ffa5c4ccd7f346709fc6904c4afed7d
return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index ed262a905a1a0bf4247538f1db210ed41c73809c..9f232d8e1dc5adf3cc3adc5af7fd42c5e78ed48d 100644
index 9bd615ef8f7de16f823954af3ecf76897dec90df..73d5027234cca5a9d0dfd60f455fe67ba5174558 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -121,6 +121,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -743,7 +743,7 @@ index 82d8e23e7e0b8f806fe93597c8869518dde0cb36..69a0b774f653b5c95ac63ba08f79174d
protected void defineSynchedData(SynchedEntityData.Builder builder) {
super.defineSynchedData(builder);
diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
index ca53c5b45c119dce1c713dbf931251f89c90cb8d..7ede13f462e2641de63104ba34cdea03d008d33c 100644
index 0d211d4c120186667682dbb5f320ec45ef6c235d..b5e36318eb997d46d8ba8c0ab2e1096c13b4ca1c 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
@@ -49,6 +49,11 @@ public class Giant extends Monster {
@@ -1199,7 +1199,7 @@ index 0d5e828a7fb6fd6facc04a27175541ac463c918e..05c63eb6cf8a7067105c58d244c7cc27
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5eb5d8d8a818e74b0b92b2ce4e65dccbc1b4f5f3..40d6acb831aef34c0a92d0c992687264faa769f5 100644
index a4965866cc687a04cf12dbcf9f6ceff8218c0dee..35ca19ea233e262c1931747ce0b998a1e78e23ac 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -567,11 +567,13 @@ public class PurpurWorldConfig {
@@ -1852,7 +1852,7 @@ index 5eb5d8d8a818e74b0b92b2ce4e65dccbc1b4f5f3..40d6acb831aef34c0a92d0c992687264
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1500,11 +1583,13 @@ public class PurpurWorldConfig {
Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
Item item = BuiltInRegistries.ITEM.get(ResourceLocation.parse(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks);
+ polarBearTakeDamageFromWater = getBoolean("mobs.polar_bear.takes-damage-from-water", polarBearTakeDamageFromWater);