Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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

18
patches/server/0213-Mobs-always-drop-experience.patch
View File

@@ -101,7 +101,7 @@ index 2343325fa9a771de7b9445cda24a2bcd7a7c1761..f0b6118a9995bb41836685bbf94d2e7f
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 78f00014c034949b6559ca948b1b78fa90f45334..97bdd48d8fa6b04e86f2db2be612dc8af1a4cb90 100644
index dd66868e9b9f807a5e20420987336b4ddea22b9c..1dc83dd82d371321f43c1d6135e3330f7b5e4bc0 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -84,6 +84,11 @@ public class Cow extends Animal {
@@ -213,7 +213,7 @@ index 6ea8ecf8672b71533c9b979a3d46bd947fbc4b73..a27f33b7bbf7f7d5cfb3dbb0bf5b93a6
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 e486b3a73277582bc9c63b6f8ed4dfd995e34cb9..2cd961e4831bc018c46f929b302ebe7e5932637e 100644
index 4050cc4c93cbe33d3e4cc2f7aed5dfc26018e510..eac0c3f8ee77099af65e823fc687e4236b3d2746 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
@@ -201,6 +201,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -341,7 +341,7 @@ index 8f2348a7fe830a85985ce2b19cb2a9159bca711f..69cdccca01fe7d10e6d958e16d91efe0
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
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 7092070b8f540ad34b92ac6d4fc9feaca4bd296d..b9c8fe36c6a6256097ea69383bef678bbfb6c45b 100644
index cefdf05e5aa8c69309747559ec164c116a95dd88..4874d51405ce43e570ffcbf8eba4bf4aef185e50 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -92,6 +92,11 @@ public class Squid extends WaterAnimal {
@@ -549,7 +549,7 @@ index 343632a030eb423367387750fabbdae53c4bb20b..201471473b7ecc7489c4303a0d37b99f
return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
}
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 adfadd75f29a82f606824f7d98f3abec8e8591c3..577051ce45781f5463e61f335c67ab62d60f18d1 100644
index c37c27eec9d0b293063fc8841ac85810cd9af711..49c48268431b06ea0e9dd680f7ed782f989175e8 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
@@ -136,6 +136,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -597,12 +597,12 @@ index 0604b7c68373ed071ac22cabd7a961161ad228f8..43b5a0e7993ae9daef1c1ea67722347f
public boolean doHurtTarget(Entity target) {
if (super.doHurtTarget(target)) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index 904c3af4809877165a0981f76572d7f0dd0662e0..1c61b223bc6f96badce28fdce392376e4e76adc4 100644
index d2816554dc3a8bec79f5d517562cd04e7246fb07..8da09124158ce679ce1e34fa1e3c5a049f2595fb 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -279,6 +279,11 @@ public class Creeper extends Monster implements PowerableMob {
return super.dropAllDeathLoot(damagesource);
@@ -281,6 +281,11 @@ public class Creeper extends Monster implements PowerableMob {
}
// Purpur end - Config to make Creepers explode on death
+ @Override
+ protected boolean isAlwaysExperienceDropper() {
@@ -709,7 +709,7 @@ index 69a0b774f653b5c95ac63ba08f79174dc2ec648d..802d2e0eb9c007a1d087333a797ab902
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 7ede13f462e2641de63104ba34cdea03d008d33c..eab74acdcc644aa844d3daceee2d568e4f247428 100644
index b5e36318eb997d46d8ba8c0ab2e1096c13b4ca1c..262f0a9146d37ebdb600b8d304cea3d9bcfc8398 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
@@ -54,6 +54,11 @@ public class Giant extends Monster {
@@ -1157,7 +1157,7 @@ index 6250bc28db4bbac0f101cdc93c90ec4d7ec6b2ba..d342752271c76b447bb8cde50d574072
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 a188ef9206211d4a0071255b90b740ce08199c84..d0b77f8c0653f855d9afffd4a27ac23b9b4bf59e 100644
index 537e8e2502ac5ca286e5b6313bbc4294a82cdea9..5fb8ba70fc0ba10a986339032604d0df063a436d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1106,12 +1106,14 @@ public class PurpurWorldConfig {