mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-20 02:08:15 +02:00
Fix one punch man not killing mobs in some cases (#1762)
This commit is contained in:
@@ -62,7 +62,7 @@ index 3e8a8509c0574e732c8054cc2b86f74dd47d29d4..1bd1bb805060604fbe4dca6d71a863bb
|
|||||||
|
|
||||||
private void updatePlayerAttributes() {
|
private void updatePlayerAttributes() {
|
||||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
index 2e047b624ad238c6fa57d076415fc875d21f0048..cad78698428d40166fd5a4d177de2410e033b9b9 100644
|
index ae965a1c6663ea9dd9588f010cd7831b51357fb0..8ec1aa8fdd2745d2269d73a9cfbb5f489408b91d 100644
|
||||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
@@ -3008,6 +3008,8 @@ public class ServerGamePacketListenerImpl
|
@@ -3008,6 +3008,8 @@ public class ServerGamePacketListenerImpl
|
||||||
@@ -75,7 +75,7 @@ index 2e047b624ad238c6fa57d076415fc875d21f0048..cad78698428d40166fd5a4d177de2410
|
|||||||
if (itemType == Items.WATER_BUCKET && target instanceof net.minecraft.world.entity.animal.Bucketable && target instanceof LivingEntity && resendData) {
|
if (itemType == Items.WATER_BUCKET && target instanceof net.minecraft.world.entity.animal.Bucketable && target instanceof LivingEntity && resendData) {
|
||||||
target.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
|
target.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
|
||||||
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
index 504361614be832c9f042a7504e1264f8625c4d87..42a87867c64ac48ec39f82951bee9b0560a1a7ef 100644
|
index dd99157af3e234b0c2b3a74e964583dea2e5ba36..1ff07b2d360e42a073a6ff0f2a188f320f8376b3 100644
|
||||||
--- a/net/minecraft/world/entity/Entity.java
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
+++ b/net/minecraft/world/entity/Entity.java
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
@@ -3396,6 +3396,13 @@ public abstract class Entity
|
@@ -3396,6 +3396,13 @@ public abstract class Entity
|
||||||
@@ -153,7 +153,7 @@ index 504361614be832c9f042a7504e1264f8625c4d87..42a87867c64ac48ec39f82951bee9b05
|
|||||||
+ // Purpur end - Ridables
|
+ // Purpur end - Ridables
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
index 2b5991eff4b9a19572be433c0b0f9299b8156f74..10045b734c845cb225ffadc5f63e83fda0a1615d 100644
|
index 2057dacb7b48feae232d4f651104dd60ea9dc9c0..40f3e802ca9a9ca9977ce32a24bc56af971f2eaa 100644
|
||||||
--- a/net/minecraft/world/entity/LivingEntity.java
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
+++ b/net/minecraft/world/entity/LivingEntity.java
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
@@ -243,9 +243,9 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
@@ -243,9 +243,9 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
@@ -1133,7 +1133,7 @@ index 87e34dd94340be58ade945992e26dd81ee19b0a4..d2dc51d7a8d97db64bf87f8337b10442
|
|||||||
protected void randomizeAttributes(final RandomSource random) {
|
protected void randomizeAttributes(final RandomSource random) {
|
||||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
||||||
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
index 9f7d9d3a4a7a7635cacb66b6839094c1f8d68740..cab5f2ebfdfb58ab322d81702af13a47c2276903 100644
|
index 5619a7218d55c7b2ba449e9c60f4fa0160b096ee..d1049724b127c6f6307ee370ccdd4c611ec60b03 100644
|
||||||
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
@@ -81,7 +81,58 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
@@ -81,7 +81,58 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
||||||
@@ -4807,7 +4807,7 @@ index fe82f97689305de64caa52ef648308431f4aebb1..59265f8286a32a1fe7de1986df78b441
|
|||||||
public boolean doHurtTarget(final ServerLevel level, final Entity target) {
|
public boolean doHurtTarget(final ServerLevel level, final Entity target) {
|
||||||
if (super.doHurtTarget(level, target)) {
|
if (super.doHurtTarget(level, target)) {
|
||||||
diff --git a/net/minecraft/world/entity/monster/spider/Spider.java b/net/minecraft/world/entity/monster/spider/Spider.java
|
diff --git a/net/minecraft/world/entity/monster/spider/Spider.java b/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
index f80bceac44eaee98cf1a0fd3fd93810d803866cd..8d70cb4a79bb64df53e6ca9f7adb79ecfe33fe2f 100644
|
index 1507f340b16fd95985bfe49870e923c626833d18..546561f6b9960de22d84468a317c65f3cf406b29 100644
|
||||||
--- a/net/minecraft/world/entity/monster/spider/Spider.java
|
--- a/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
+++ b/net/minecraft/world/entity/monster/spider/Spider.java
|
+++ b/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
@@ -52,15 +52,34 @@ public class Spider extends Monster {
|
@@ -52,15 +52,34 @@ public class Spider extends Monster {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
index 10045b734c845cb225ffadc5f63e83fda0a1615d..16158bc0390286c24e505abe0926930c76f6bbd0 100644
|
index 40f3e802ca9a9ca9977ce32a24bc56af971f2eaa..a20626d0b750ba89836d806bef61528758849311 100644
|
||||||
--- a/net/minecraft/world/entity/LivingEntity.java
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
+++ b/net/minecraft/world/entity/LivingEntity.java
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
@@ -296,6 +296,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
@@ -296,6 +296,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
@@ -347,7 +347,7 @@ index d2dc51d7a8d97db64bf87f8337b10442acc5bc47..8ba8430f41ce74736f405bfac2ef5de6
|
|||||||
protected void randomizeAttributes(final RandomSource random) {
|
protected void randomizeAttributes(final RandomSource random) {
|
||||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
||||||
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
index cab5f2ebfdfb58ab322d81702af13a47c2276903..12abeae3623b49819ab6f852c88ee86ed8c69948 100644
|
index d1049724b127c6f6307ee370ccdd4c611ec60b03..5a62d6fcc6420878a5d612e556503f01f5084d44 100644
|
||||||
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
@@ -134,6 +134,23 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
@@ -134,6 +134,23 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
||||||
@@ -1703,7 +1703,7 @@ index 59265f8286a32a1fe7de1986df78b441861e9367..beba154f2a76d3d8f7d9b44c1b45b83c
|
|||||||
public boolean doHurtTarget(final ServerLevel level, final Entity target) {
|
public boolean doHurtTarget(final ServerLevel level, final Entity target) {
|
||||||
if (super.doHurtTarget(level, target)) {
|
if (super.doHurtTarget(level, target)) {
|
||||||
diff --git a/net/minecraft/world/entity/monster/spider/Spider.java b/net/minecraft/world/entity/monster/spider/Spider.java
|
diff --git a/net/minecraft/world/entity/monster/spider/Spider.java b/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
index 8d70cb4a79bb64df53e6ca9f7adb79ecfe33fe2f..a17be779e6ac85129f0646128378b472403faf7b 100644
|
index 546561f6b9960de22d84468a317c65f3cf406b29..8834ecb96e3a6ec28f8700b23971d00136f26a4d 100644
|
||||||
--- a/net/minecraft/world/entity/monster/spider/Spider.java
|
--- a/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
+++ b/net/minecraft/world/entity/monster/spider/Spider.java
|
+++ b/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
@@ -69,6 +69,14 @@ public class Spider extends Monster {
|
@@ -69,6 +69,14 @@ public class Spider extends Monster {
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ index af2bd8a5cf760792a63dfb9c2370360f288beab6..016167a6ff90dfe5a2e66596eaab2c8f
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/net/minecraft/world/entity/npc/villager/AbstractVillager.java b/net/minecraft/world/entity/npc/villager/AbstractVillager.java
|
diff --git a/net/minecraft/world/entity/npc/villager/AbstractVillager.java b/net/minecraft/world/entity/npc/villager/AbstractVillager.java
|
||||||
index f6ac52144958b48dad0b0f682634fad3d8e9557c..0825e06843c3613843cf7c15fa3fb3a1c0787781 100644
|
index b5247d45159898cd6ede425a4a99db8439a105b6..0c9fba0e41126a585c2471abc2f18ff50a691805 100644
|
||||||
--- a/net/minecraft/world/entity/npc/villager/AbstractVillager.java
|
--- a/net/minecraft/world/entity/npc/villager/AbstractVillager.java
|
||||||
+++ b/net/minecraft/world/entity/npc/villager/AbstractVillager.java
|
+++ b/net/minecraft/world/entity/npc/villager/AbstractVillager.java
|
||||||
@@ -52,6 +52,7 @@ import org.jspecify.annotations.Nullable;
|
@@ -52,6 +52,7 @@ import org.jspecify.annotations.Nullable;
|
||||||
@@ -43,7 +43,7 @@ index f6ac52144958b48dad0b0f682634fad3d8e9557c..0825e06843c3613843cf7c15fa3fb3a1
|
|||||||
private static final EntityDataAccessor<Integer> DATA_UNHAPPY_COUNTER = SynchedEntityData.defineId(AbstractVillager.class, EntityDataSerializers.INT);
|
private static final EntityDataAccessor<Integer> DATA_UNHAPPY_COUNTER = SynchedEntityData.defineId(AbstractVillager.class, EntityDataSerializers.INT);
|
||||||
private @Nullable Player tradingPlayer;
|
private @Nullable Player tradingPlayer;
|
||||||
diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
|
diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
index ddbfcf8e16e17a3f482cb99de61ae8e40a383c18..6105aa39baf888dd625f4d345822a4058bf83ef4 100644
|
index 80f5197c4b33d75ee4d3791db22ed5e43f5c2a65..19bba23d87543574d5d8a4139ac93e751fe690d9 100644
|
||||||
--- a/net/minecraft/world/entity/npc/villager/Villager.java
|
--- a/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
|
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
@@ -271,6 +271,7 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re
|
@@ -271,6 +271,7 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
index 8af06875ea2fcb8e9bc08d370ff225c702e51031..9b7b285251aff741d8f2c19b3b558f81e77c0aaa 100644
|
index a20626d0b750ba89836d806bef61528758849311..fd20156ba4319778323756485557b3dbc32b09c1 100644
|
||||||
--- a/net/minecraft/world/entity/LivingEntity.java
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
+++ b/net/minecraft/world/entity/LivingEntity.java
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
@@ -3945,7 +3945,16 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
@@ -3945,7 +3945,16 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
@@ -49,7 +49,7 @@ index c17607cb1fd5403f17a64b4218571e669b840a2e..6545145e1f83b333fd1d05ab714c9869
|
|||||||
itemStack.shrink(1); // Moved up from below
|
itemStack.shrink(1); // Moved up from below
|
||||||
} else {
|
} else {
|
||||||
diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
|
diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
|
||||||
index 87cdc33a42d94316990b934b2153e53117c88522..8c3d8ec4423d07ea3db3e0cbd5c79e1a468541ef 100644
|
index aa62f69da48884f1d4e8834fe4cb9c02ce1d472e..2e511d2adaedef5e954532783beb8a77b3e000d4 100644
|
||||||
--- a/net/minecraft/world/item/ItemStack.java
|
--- a/net/minecraft/world/item/ItemStack.java
|
||||||
+++ b/net/minecraft/world/item/ItemStack.java
|
+++ b/net/minecraft/world/item/ItemStack.java
|
||||||
@@ -694,6 +694,14 @@ public final class ItemStack implements DataComponentHolder, ItemInstance {
|
@@ -694,6 +694,14 @@ public final class ItemStack implements DataComponentHolder, ItemInstance {
|
||||||
@@ -68,7 +68,7 @@ index 87cdc33a42d94316990b934b2153e53117c88522..8c3d8ec4423d07ea3db3e0cbd5c79e1a
|
|||||||
onBreak.accept(item);
|
onBreak.accept(item);
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java
|
diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java
|
||||||
index 710b8711184ea6e1cf0dfd338b897923ed2b79fb..82995f60dbb62325b46bc8a87cd2087461715c4f 100644
|
index 4352c807848acbac4e58cd84f376425c3ae6f2f7..50e38d147934d060a0cf342cec609d7d10476298 100644
|
||||||
--- a/net/minecraft/world/item/TridentItem.java
|
--- a/net/minecraft/world/item/TridentItem.java
|
||||||
+++ b/net/minecraft/world/item/TridentItem.java
|
+++ b/net/minecraft/world/item/TridentItem.java
|
||||||
@@ -125,6 +125,16 @@ public class TridentItem extends Item implements ProjectileItem {
|
@@ -125,6 +125,16 @@ public class TridentItem extends Item implements ProjectileItem {
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ index 1c985585a2da43e59bb5b9ebd742e1e31b2cda29..c3f2d9ab49eb501f26939387624f3262
|
|||||||
public boolean isSunSensitive() {
|
public boolean isSunSensitive() {
|
||||||
return false;
|
return false;
|
||||||
diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||||
index 900c768b0118153ea2c74dea0960aef3217da441..5bf9970b93e27004dd832c8465dc95a681583ef6 100644
|
index 1fbebd0cd04182679400ef3c33bf0730c01bc645..bf94d8e9512eeb294914c748be091f6565cca676 100644
|
||||||
--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
|
--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||||
+++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
+++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||||
@@ -138,6 +138,20 @@ public class Zombie extends Monster {
|
@@ -138,6 +138,20 @@ public class Zombie extends Monster {
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ index 0bfb8cd53e87d986679d4e26ebf77c52e58c1c10..fd901b84bc105a2ccf59eef687a20d53
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
index b45eb26fa78a4bafa247c3cf8f20fb2f076646c5..c33910433eae54df4d1d4b918c28b361bd510577 100644
|
index a22f245acca8e5ea3334708a27ed5029e472c205..962539961aeb73914f5d250afa7a4109765bf438 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Phantom.java
|
--- a/net/minecraft/world/entity/monster/Phantom.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
@@ -50,6 +50,7 @@ public class Phantom extends Mob implements Enemy {
|
@@ -50,6 +50,7 @@ public class Phantom extends Mob implements Enemy {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
index c33910433eae54df4d1d4b918c28b361bd510577..da014eae20abb320ecb897517810e4ab53783a89 100644
|
index 962539961aeb73914f5d250afa7a4109765bf438..b3a79a6387fbf00c97da4452cb48e4808e5391be 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Phantom.java
|
--- a/net/minecraft/world/entity/monster/Phantom.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
@@ -55,6 +55,7 @@ public class Phantom extends Mob implements Enemy {
|
@@ -55,6 +55,7 @@ public class Phantom extends Mob implements Enemy {
|
||||||
|
|||||||
@@ -209,7 +209,7 @@ index 8ba8430f41ce74736f405bfac2ef5de6fffe7d49..dbb586058f38b6c4f81e2f6567b7ae8e
|
|||||||
protected void randomizeAttributes(final RandomSource random) {
|
protected void randomizeAttributes(final RandomSource random) {
|
||||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
||||||
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
index 12abeae3623b49819ab6f852c88ee86ed8c69948..b3c8ccbb3f79043427dcb6f383c4b02d35124689 100644
|
index 5a62d6fcc6420878a5d612e556503f01f5084d44..138e10184c2b115e04a8a4c73ccc9a87a90e7409 100644
|
||||||
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
@@ -151,6 +151,13 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
@@ -151,6 +151,13 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ farm Nether Wart. Reimplemented based on a feature of the carpet-extra
|
|||||||
mod.
|
mod.
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
|
diff --git a/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
|
||||||
index c49f72d3554c5cf49cbbc57897288da876b4e5f5..9318b27ca960ee00774892b3fd244b0fca1f6e35 100644
|
index 6f7af24143421cac84d9c1175acd88a776d8652d..d3f88e3274abc5904544a84a6f1e1d10a441b1e7 100644
|
||||||
--- a/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
|
--- a/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
|
||||||
+++ b/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
|
+++ b/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
|
||||||
@@ -31,6 +31,7 @@ public class HarvestFarmland extends Behavior<Villager> {
|
@@ -31,6 +31,7 @@ public class HarvestFarmland extends Behavior<Villager> {
|
||||||
@@ -89,7 +89,7 @@ index 1d405a77c4cf70bd818a4f59163e5b319808d5f3..6a7b51acfc2cd157ce81c3a92d263337
|
|||||||
throwHalfStack(body, this.trades, target);
|
throwHalfStack(body, this.trades, target);
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java b/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
|
diff --git a/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java b/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
|
||||||
index a5d1b66b07002545381dfc449a2eda26546b904c..0e5039e07c3df288e4b1377225ac52cc96675b66 100644
|
index e70ada99503e9df863e0f1e17dcafe85b5e4efd5..ebd320fa575fbf955f900f7ec0bbf6e17aa73b05 100644
|
||||||
--- a/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
|
--- a/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
|
||||||
+++ b/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
|
+++ b/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
|
||||||
@@ -74,8 +74,13 @@ public class VillagerGoalPackages {
|
@@ -74,8 +74,13 @@ public class VillagerGoalPackages {
|
||||||
@@ -135,7 +135,7 @@ index ec12508c112b1e7748a5d197b73a0d540bed10fc..f2daabad51d565cae11e8bfce8b1bf40
|
|||||||
brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, jobSites);
|
brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, jobSites);
|
||||||
} else {
|
} else {
|
||||||
diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
|
diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
index 6105aa39baf888dd625f4d345822a4058bf83ef4..fffc71d2f0cd0d4c4f5d8fad38130208cdbe5e67 100644
|
index 19bba23d87543574d5d8a4139ac93e751fe690d9..27b2675059795b54b7d217442065bd50618ac7ae 100644
|
||||||
--- a/net/minecraft/world/entity/npc/villager/Villager.java
|
--- a/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
|
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
@@ -148,7 +148,7 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re
|
@@ -148,7 +148,7 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing override to everything affected
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
index bd10e79f0b0d9558fdefebe801db33b49b2f28ac..1964830b4f35d0fde2d3fc9a0630e4dfc6ff9eff 100644
|
index fd20156ba4319778323756485557b3dbc32b09c1..5ce6af2b5b22f439aa747d937f0baef7c2479635 100644
|
||||||
--- a/net/minecraft/world/entity/LivingEntity.java
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
+++ b/net/minecraft/world/entity/LivingEntity.java
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
@@ -1950,7 +1950,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
@@ -1950,7 +1950,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ index d4178d85b74a41a0d2808681008f1686578db98d..a3a98df8ffeb33d86330b5561252eda5
|
|||||||
public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
|
public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
|
||||||
return 0.0F;
|
return 0.0F;
|
||||||
diff --git a/net/minecraft/world/entity/animal/bee/Bee.java b/net/minecraft/world/entity/animal/bee/Bee.java
|
diff --git a/net/minecraft/world/entity/animal/bee/Bee.java b/net/minecraft/world/entity/animal/bee/Bee.java
|
||||||
index 36c5c555faa9a29ec742c97ea8a6fcf720e6d9a1..4fba5ce59065ac024a0108726623dab894ae45c5 100644
|
index 44f11b07a2b8a37db399976c4c79b44c4416f2e9..e85c33e4d0d19d4e7f8ef837ec0a611e19bc19e4 100644
|
||||||
--- a/net/minecraft/world/entity/animal/bee/Bee.java
|
--- a/net/minecraft/world/entity/animal/bee/Bee.java
|
||||||
+++ b/net/minecraft/world/entity/animal/bee/Bee.java
|
+++ b/net/minecraft/world/entity/animal/bee/Bee.java
|
||||||
@@ -186,7 +186,7 @@ public class Bee extends Animal implements FlyingAnimal, NeutralMob {
|
@@ -186,7 +186,7 @@ public class Bee extends Animal implements FlyingAnimal, NeutralMob {
|
||||||
@@ -122,7 +122,7 @@ index 68a4edef68c9db6b2b0716fc6283e2c7345d4cda..d3e5e12c4e3c168a3a15d611f8ae5845
|
|||||||
public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
|
public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
|
||||||
return level.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : level.getPathfindingCostFromLightLevels(pos);
|
return level.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : level.getPathfindingCostFromLightLevels(pos);
|
||||||
diff --git a/net/minecraft/world/entity/animal/dolphin/Dolphin.java b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
diff --git a/net/minecraft/world/entity/animal/dolphin/Dolphin.java b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
||||||
index 857bafb865b78d83716d2d5f491c0928ae6951ca..c372a2cc7ec9ac03629a73a45bfc58f77894d63b 100644
|
index b2e6307ead267fa8a1acd6956c409f2bcbf28c41..0cab39846b6ad5d0e0ce627d6a84f73340fcd328 100644
|
||||||
--- a/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
--- a/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
||||||
+++ b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
+++ b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
||||||
@@ -162,6 +162,13 @@ public class Dolphin extends AgeableWaterCreature {
|
@@ -162,6 +162,13 @@ public class Dolphin extends AgeableWaterCreature {
|
||||||
@@ -176,7 +176,7 @@ index dbb586058f38b6c4f81e2f6567b7ae8ebbaff5a2..64603ad973bdb697ca75642e8e42e705
|
|||||||
protected void randomizeAttributes(final RandomSource random) {
|
protected void randomizeAttributes(final RandomSource random) {
|
||||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
||||||
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
index b3c8ccbb3f79043427dcb6f383c4b02d35124689..e277a58a1c761198f59b987c95567b6e4d9c440b 100644
|
index 138e10184c2b115e04a8a4c73ccc9a87a90e7409..c56d6f3a8a0c5a95da49ab34c72659872259a723 100644
|
||||||
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
@@ -158,6 +158,13 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
@@ -158,6 +158,13 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
||||||
@@ -266,7 +266,7 @@ index 4be11663154a870a21832ddba05764a897ce90bd..586151b916a5e21c36578aa04cab9d71
|
|||||||
return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 25.0);
|
return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 25.0);
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/animal/feline/Cat.java b/net/minecraft/world/entity/animal/feline/Cat.java
|
diff --git a/net/minecraft/world/entity/animal/feline/Cat.java b/net/minecraft/world/entity/animal/feline/Cat.java
|
||||||
index 5c235149eca10c216f0f8d6e645a439d7dbcfbc3..0493926c7918059d82bafd20fed0883bb331bd55 100644
|
index 334879e3f1a28825749e7e4a3863454ee0a5ac9a..966b2cbc5b4f71d2cfa8759c2263407ee73c3d8e 100644
|
||||||
--- a/net/minecraft/world/entity/animal/feline/Cat.java
|
--- a/net/minecraft/world/entity/animal/feline/Cat.java
|
||||||
+++ b/net/minecraft/world/entity/animal/feline/Cat.java
|
+++ b/net/minecraft/world/entity/animal/feline/Cat.java
|
||||||
@@ -135,6 +135,13 @@ public class Cat extends TamableAnimal {
|
@@ -135,6 +135,13 @@ public class Cat extends TamableAnimal {
|
||||||
@@ -320,7 +320,7 @@ index 948d6a8e3465fd5985e91ca7eaa5f02258ad9625..f44214eaa47c2021f7ca9c84a7b89be1
|
|||||||
public ItemStack getBucketItemStack() {
|
public ItemStack getBucketItemStack() {
|
||||||
return new ItemStack(Items.COD_BUCKET);
|
return new ItemStack(Items.COD_BUCKET);
|
||||||
diff --git a/net/minecraft/world/entity/animal/fish/Pufferfish.java b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
diff --git a/net/minecraft/world/entity/animal/fish/Pufferfish.java b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
||||||
index 3ed54f746305a284177b609f410e2b7e9a6e6796..17dba2f70251c2d5f75cc116b300f328f117cecb 100644
|
index 26acbeff80d3a4216b69b9842381f3fa48c9862b..a0f1ea76011dc3aa6e8a702528062f5fafe07e01 100644
|
||||||
--- a/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
--- a/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
||||||
+++ b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
+++ b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
||||||
@@ -66,6 +66,13 @@ public class Pufferfish extends AbstractFish {
|
@@ -66,6 +66,13 @@ public class Pufferfish extends AbstractFish {
|
||||||
@@ -374,7 +374,7 @@ index fbe7b76aac06bb0dce7ae53dea85e947a53d1b64..17bc569bf97026e2c072633f1ad6e9e0
|
|||||||
return "entity.minecraft.tropical_fish.predefined." + index;
|
return "entity.minecraft.tropical_fish.predefined." + index;
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/animal/fox/Fox.java b/net/minecraft/world/entity/animal/fox/Fox.java
|
diff --git a/net/minecraft/world/entity/animal/fox/Fox.java b/net/minecraft/world/entity/animal/fox/Fox.java
|
||||||
index f781d02d10317bf7cf9b5fe50706bbefb62820d3..aa419e7cb456f664c1eca1286777caca6bd10e7a 100644
|
index 29c09797530fa25e31177cf402ecac6a8f43bb23..c70e04d20e37b7063618805016d24a459ee65c91 100644
|
||||||
--- a/net/minecraft/world/entity/animal/fox/Fox.java
|
--- a/net/minecraft/world/entity/animal/fox/Fox.java
|
||||||
+++ b/net/minecraft/world/entity/animal/fox/Fox.java
|
+++ b/net/minecraft/world/entity/animal/fox/Fox.java
|
||||||
@@ -208,6 +208,13 @@ public class Fox extends Animal {
|
@@ -208,6 +208,13 @@ public class Fox extends Animal {
|
||||||
@@ -392,7 +392,7 @@ index f781d02d10317bf7cf9b5fe50706bbefb62820d3..aa419e7cb456f664c1eca1286777caca
|
|||||||
protected void defineSynchedData(final SynchedEntityData.Builder entityData) {
|
protected void defineSynchedData(final SynchedEntityData.Builder entityData) {
|
||||||
super.defineSynchedData(entityData);
|
super.defineSynchedData(entityData);
|
||||||
diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
|
diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
|
||||||
index da763ba40fdc52d6f6fec97e5e288fbef343ead6..0d40bbd8c42178c712f23300364138389ecde548 100644
|
index c8b2ef70ca3f730d87c30af9f29adb2ad083d26f..24cccc6afadfc91feb6157882c1b76da0d3657d1 100644
|
||||||
--- a/net/minecraft/world/entity/animal/goat/Goat.java
|
--- a/net/minecraft/world/entity/animal/goat/Goat.java
|
||||||
+++ b/net/minecraft/world/entity/animal/goat/Goat.java
|
+++ b/net/minecraft/world/entity/animal/goat/Goat.java
|
||||||
@@ -124,6 +124,13 @@ public class Goat extends Animal {
|
@@ -124,6 +124,13 @@ public class Goat extends Animal {
|
||||||
@@ -459,7 +459,7 @@ index 7091f5bc2ecb9d4b86162fe364447df65d8e9348..2d3127f6846ff9eda1a0b89764dc837d
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
diff --git a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
||||||
index 75a32b65da7080391d0c37622db9cb98c5e092b6..d3367430da307e2c0748874cbe77f265860152a0 100644
|
index b049adf5604555041102497d7fe0c865c56d751f..a73d8d3eb04602eac78f142c336e464de22ecc83 100644
|
||||||
--- a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
--- a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
||||||
+++ b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
+++ b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
||||||
@@ -161,6 +161,13 @@ public class HappyGhast extends Animal {
|
@@ -161,6 +161,13 @@ public class HappyGhast extends Animal {
|
||||||
@@ -477,7 +477,7 @@ index 75a32b65da7080391d0c37622db9cb98c5e092b6..d3367430da307e2c0748874cbe77f265
|
|||||||
protected void ageBoundaryReached() {
|
protected void ageBoundaryReached() {
|
||||||
if (this.isBaby()) {
|
if (this.isBaby()) {
|
||||||
diff --git a/net/minecraft/world/entity/animal/panda/Panda.java b/net/minecraft/world/entity/animal/panda/Panda.java
|
diff --git a/net/minecraft/world/entity/animal/panda/Panda.java b/net/minecraft/world/entity/animal/panda/Panda.java
|
||||||
index 02d5949fb91bbee84fa067dac14d20f53f4a029b..f97b8feaedb84baf479998cef7257231f85412d6 100644
|
index f413e018856d485f706d2b8742b92b3253fe6532..2f9f588c384d133f82bb4b2d08c8f7c7a72c0915 100644
|
||||||
--- a/net/minecraft/world/entity/animal/panda/Panda.java
|
--- a/net/minecraft/world/entity/animal/panda/Panda.java
|
||||||
+++ b/net/minecraft/world/entity/animal/panda/Panda.java
|
+++ b/net/minecraft/world/entity/animal/panda/Panda.java
|
||||||
@@ -153,6 +153,13 @@ public class Panda extends Animal {
|
@@ -153,6 +153,13 @@ public class Panda extends Animal {
|
||||||
@@ -567,7 +567,7 @@ index 4d79ce89c21ba0b973bbda01bf53665e3b7a1902..7dade80db9430e4db587ed23df992d70
|
|||||||
public void registerGoals() {
|
public void registerGoals() {
|
||||||
this.goalSelector.addGoal(1, new FloatGoal(this));
|
this.goalSelector.addGoal(1, new FloatGoal(this));
|
||||||
diff --git a/net/minecraft/world/entity/animal/sheep/Sheep.java b/net/minecraft/world/entity/animal/sheep/Sheep.java
|
diff --git a/net/minecraft/world/entity/animal/sheep/Sheep.java b/net/minecraft/world/entity/animal/sheep/Sheep.java
|
||||||
index 9cc59891521963204399b7f67d94bb78c7e75fb6..0ceaa6dd493d0258c419d8b5c4394b35c0808704 100644
|
index e83fe71b4f63f8f7fa1976f7d2165c36bbb184bf..49389028a34971bbd1c480ba91e2b53d3c26513c 100644
|
||||||
--- a/net/minecraft/world/entity/animal/sheep/Sheep.java
|
--- a/net/minecraft/world/entity/animal/sheep/Sheep.java
|
||||||
+++ b/net/minecraft/world/entity/animal/sheep/Sheep.java
|
+++ b/net/minecraft/world/entity/animal/sheep/Sheep.java
|
||||||
@@ -95,6 +95,13 @@ public class Sheep extends Animal implements Shearable {
|
@@ -95,6 +95,13 @@ public class Sheep extends Animal implements Shearable {
|
||||||
@@ -603,7 +603,7 @@ index cb3d0bd838473af87af74c7d1bab38593a6c8f6d..1fa3d614dd1c45ec42caffbe92e3f8db
|
|||||||
protected ParticleOptions getInkParticle() {
|
protected ParticleOptions getInkParticle() {
|
||||||
return ParticleTypes.GLOW_SQUID_INK;
|
return ParticleTypes.GLOW_SQUID_INK;
|
||||||
diff --git a/net/minecraft/world/entity/animal/squid/Squid.java b/net/minecraft/world/entity/animal/squid/Squid.java
|
diff --git a/net/minecraft/world/entity/animal/squid/Squid.java b/net/minecraft/world/entity/animal/squid/Squid.java
|
||||||
index cc0a1aaa6aa710c0f0b4df0e46e8ad7931f26b2f..e350763a3a22d825a25f02b60bd4c9223aa81f62 100644
|
index 49ef7f4004a2f82df2d8cbf0d0473a5d84588fac..8b26b08956e63d3ccb9a7006cfa57ac3771339ad 100644
|
||||||
--- a/net/minecraft/world/entity/animal/squid/Squid.java
|
--- a/net/minecraft/world/entity/animal/squid/Squid.java
|
||||||
+++ b/net/minecraft/world/entity/animal/squid/Squid.java
|
+++ b/net/minecraft/world/entity/animal/squid/Squid.java
|
||||||
@@ -104,6 +104,13 @@ public class Squid extends AgeableWaterCreature {
|
@@ -104,6 +104,13 @@ public class Squid extends AgeableWaterCreature {
|
||||||
@@ -639,7 +639,7 @@ index 62d9fce83cc44165c5356049a12bf6081c925857..6d09c0de38f2c91d2a0ab6dd0b694ab4
|
|||||||
this.homePos = pos;
|
this.homePos = pos;
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/animal/wolf/Wolf.java b/net/minecraft/world/entity/animal/wolf/Wolf.java
|
diff --git a/net/minecraft/world/entity/animal/wolf/Wolf.java b/net/minecraft/world/entity/animal/wolf/Wolf.java
|
||||||
index 0561b38982c205edc848b1650152491698a80e29..781cac493f909b02483e5c4064cc2cc791b1dabd 100644
|
index 0ac4e30fd4f3158b5f53e9ba8bc70964907c63a2..cd7981c9c040e1b745e08680bf3685903cbda8ff 100644
|
||||||
--- a/net/minecraft/world/entity/animal/wolf/Wolf.java
|
--- a/net/minecraft/world/entity/animal/wolf/Wolf.java
|
||||||
+++ b/net/minecraft/world/entity/animal/wolf/Wolf.java
|
+++ b/net/minecraft/world/entity/animal/wolf/Wolf.java
|
||||||
@@ -220,6 +220,13 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
@@ -220,6 +220,13 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||||
@@ -657,7 +657,7 @@ index 0561b38982c205edc848b1650152491698a80e29..781cac493f909b02483e5c4064cc2cc7
|
|||||||
protected void registerGoals() {
|
protected void registerGoals() {
|
||||||
this.goalSelector.addGoal(1, new FloatGoal(this));
|
this.goalSelector.addGoal(1, new FloatGoal(this));
|
||||||
diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||||
index 51ca6a3fa75f3aef715d786a21327452390dde94..d7b909d65c8ef716ad652c97425148b7fbcd8f2e 100644
|
index 89acbf42f9ce83c41bb2167e332e1b20e6e8fa56..26a525dc6458e9ebcc37dafa0d73518e65d54f42 100644
|
||||||
--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
--- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||||
+++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
+++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||||
@@ -170,6 +170,13 @@ public class EnderDragon extends Mob implements Enemy {
|
@@ -170,6 +170,13 @@ public class EnderDragon extends Mob implements Enemy {
|
||||||
@@ -675,7 +675,7 @@ index 51ca6a3fa75f3aef715d786a21327452390dde94..d7b909d65c8ef716ad652c97425148b7
|
|||||||
return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0).add(Attributes.CAMERA_DISTANCE, 16.0);
|
return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0).add(Attributes.CAMERA_DISTANCE, 16.0);
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||||
index 3e934aee6f651843d861cc87cc1f01a87742edf3..10818999c4e796a4dfd5a7dd21772c9eb8ca2579 100644
|
index 30d9d12d67e2adb7d37c2a38ea1a5b528ba4ab06..5e206030d9ccabbefe9c64332125526030d65750 100644
|
||||||
--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||||
+++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
+++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||||
@@ -222,6 +222,13 @@ public class WitherBoss extends Monster implements RangedAttackMob {
|
@@ -222,6 +222,13 @@ public class WitherBoss extends Monster implements RangedAttackMob {
|
||||||
@@ -791,7 +791,7 @@ index 040f0b59d93b1b94495253f3286bdba123c22ef4..859d490dd3be2843dde3a811bcc0d51e
|
|||||||
protected void registerGoals() {
|
protected void registerGoals() {
|
||||||
this.goalSelector.addGoal(1, new FloatGoal(this));
|
this.goalSelector.addGoal(1, new FloatGoal(this));
|
||||||
diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java
|
diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java
|
||||||
index 254548dd024e4963bbcb1b1fce99194461d3f54d..89a2097c2c26dae7f12ddbac10bc091ec7f228d7 100644
|
index 4a786f17a7a8e6175775c4705445e9dff1b2aa7c..64800fe5cfb3488b63126ed09f1f678d6ebd1d3b 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Ghast.java
|
--- a/net/minecraft/world/entity/monster/Ghast.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Ghast.java
|
+++ b/net/minecraft/world/entity/monster/Ghast.java
|
||||||
@@ -83,6 +83,13 @@ public class Ghast extends Mob implements Enemy {
|
@@ -83,6 +83,13 @@ public class Ghast extends Mob implements Enemy {
|
||||||
@@ -827,7 +827,7 @@ index c39031e8fdfb0dff7867d9525dbddde110242647..43ebfe06ce2a8c15787d72a8ef54cd6c
|
|||||||
return Monster.createMonsterAttributes()
|
return Monster.createMonsterAttributes()
|
||||||
.add(Attributes.MAX_HEALTH, 100.0)
|
.add(Attributes.MAX_HEALTH, 100.0)
|
||||||
diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java
|
diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java
|
||||||
index 12f6b4bf9fa011db34617e2115206202d7f2d32e..9ca62d9663fc2e8eb49780ceb7ff38e0363a09a6 100644
|
index d5880eebf3c64dab03234ac55110645541413c4a..ea7e6a1b4dad1b702ddc5b6004c5ebdfd541334d 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Guardian.java
|
--- a/net/minecraft/world/entity/monster/Guardian.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Guardian.java
|
+++ b/net/minecraft/world/entity/monster/Guardian.java
|
||||||
@@ -97,6 +97,13 @@ public class Guardian extends Monster {
|
@@ -97,6 +97,13 @@ public class Guardian extends Monster {
|
||||||
@@ -863,7 +863,7 @@ index d40a4daeec1500f2d9865022ee6e3c386ad7533e..fba41f261e57a050d4e24d2611cc27ed
|
|||||||
return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
|
return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
index da014eae20abb320ecb897517810e4ab53783a89..20096d8305bbfc29195834b87245c94096986ec8 100644
|
index b3a79a6387fbf00c97da4452cb48e4808e5391be..646ec1cfc192e16939c9e3dac04b77d1429f82e3 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Phantom.java
|
--- a/net/minecraft/world/entity/monster/Phantom.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
@@ -129,6 +129,13 @@ public class Phantom extends Mob implements Enemy {
|
@@ -129,6 +129,13 @@ public class Phantom extends Mob implements Enemy {
|
||||||
@@ -881,7 +881,7 @@ index da014eae20abb320ecb897517810e4ab53783a89..20096d8305bbfc29195834b87245c940
|
|||||||
public boolean isFlapping() {
|
public boolean isFlapping() {
|
||||||
return (this.getUniqueFlapTickOffset() + this.tickCount) % TICKS_PER_FLAP == 0;
|
return (this.getUniqueFlapTickOffset() + this.tickCount) % TICKS_PER_FLAP == 0;
|
||||||
diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
|
diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
|
||||||
index e0ffded3500b221d5c65cff9377120e8c6c7d8c6..bb19e3f2e6522e8b7db32061c0ae2b2a37679369 100644
|
index 01e09b39ac5385e7cbfa8a38df94884c17f8f8c0..3e0403635cb9ce3d0894705db6727d9a7cc4d628 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Ravager.java
|
--- a/net/minecraft/world/entity/monster/Ravager.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Ravager.java
|
+++ b/net/minecraft/world/entity/monster/Ravager.java
|
||||||
@@ -101,6 +101,13 @@ public class Ravager extends Raider {
|
@@ -101,6 +101,13 @@ public class Ravager extends Raider {
|
||||||
@@ -899,7 +899,7 @@ index e0ffded3500b221d5c65cff9377120e8c6c7d8c6..bb19e3f2e6522e8b7db32061c0ae2b2a
|
|||||||
protected void registerGoals() {
|
protected void registerGoals() {
|
||||||
super.registerGoals();
|
super.registerGoals();
|
||||||
diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
|
diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
|
||||||
index 84e27edf490fbe4ed0142b9bb90aab37151acf3d..cf49a580c8dacb895b7a8ec2531d3afee2ffc30c 100644
|
index 2ba213e85002f7c76e3dbd8b386ebbb0b11fa86b..67aa12ee4a58e7cd31efb47cd1d71eaa2cc6af7d 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Shulker.java
|
--- a/net/minecraft/world/entity/monster/Shulker.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Shulker.java
|
+++ b/net/minecraft/world/entity/monster/Shulker.java
|
||||||
@@ -135,6 +135,13 @@ public class Shulker extends AbstractGolem implements Enemy {
|
@@ -135,6 +135,13 @@ public class Shulker extends AbstractGolem implements Enemy {
|
||||||
@@ -935,7 +935,7 @@ index e5a0a199685366f082904eb5e7550f0160f9c706..205c05f46d70d37e11a0e35c97128e0c
|
|||||||
protected void registerGoals() {
|
protected void registerGoals() {
|
||||||
this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
|
this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
|
||||||
diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
|
diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
|
||||||
index 0713239089bac454b3228d80aaabfd1fca4bd08b..556930ac4d06b4f46a87d237857006729fea5ef5 100644
|
index f541ccef625ab0d560f4781c28ad7ae3b67196d6..834125d0ded28a1d7a39a3e5fcf6a5bb967c7f91 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Slime.java
|
--- a/net/minecraft/world/entity/monster/Slime.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Slime.java
|
+++ b/net/minecraft/world/entity/monster/Slime.java
|
||||||
@@ -135,6 +135,13 @@ public class Slime extends Mob implements Enemy {
|
@@ -135,6 +135,13 @@ public class Slime extends Mob implements Enemy {
|
||||||
@@ -975,7 +975,7 @@ index 38a17c219bce1a8a8a67b136e0eaf5cf15ec94fd..1b6137674d807ed29d56e3f3120abe60
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/net/minecraft/world/entity/monster/Vex.java b/net/minecraft/world/entity/monster/Vex.java
|
diff --git a/net/minecraft/world/entity/monster/Vex.java b/net/minecraft/world/entity/monster/Vex.java
|
||||||
index 62fe1bb1632fbe8edf901c22c7972e729a5f6100..c7700ff6b7faf06116626ad95e11cd4604751eda 100644
|
index 29e9a0deb5aa99800dc6554ad6bba36bbe6dd80e..917f256f072ba29ae77e4976dd4d49ffcb2a0e35 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Vex.java
|
--- a/net/minecraft/world/entity/monster/Vex.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Vex.java
|
+++ b/net/minecraft/world/entity/monster/Vex.java
|
||||||
@@ -111,6 +111,13 @@ public class Vex extends Monster implements TraceableEntity {
|
@@ -111,6 +111,13 @@ public class Vex extends Monster implements TraceableEntity {
|
||||||
@@ -1047,7 +1047,7 @@ index d158807f22a0a08614b2d7054663ef2782a519e3..d001cf955dba66435079eb2cc30e05ae
|
|||||||
public void setTimeInOverworld(final int timeInOverworld) {
|
public void setTimeInOverworld(final int timeInOverworld) {
|
||||||
this.timeInOverworld = timeInOverworld;
|
this.timeInOverworld = timeInOverworld;
|
||||||
diff --git a/net/minecraft/world/entity/monster/illager/Evoker.java b/net/minecraft/world/entity/monster/illager/Evoker.java
|
diff --git a/net/minecraft/world/entity/monster/illager/Evoker.java b/net/minecraft/world/entity/monster/illager/Evoker.java
|
||||||
index d091a12ed1df31f945a04f50af1cbb89a16ca0cd..75276deb3208437fce669f9e483ff6c7a99d69a3 100644
|
index b6a84372a9d1486998a92fdfa1f44f2158c03a51..a766f1139459488accd0d720be3ff522e88c3d09 100644
|
||||||
--- a/net/minecraft/world/entity/monster/illager/Evoker.java
|
--- a/net/minecraft/world/entity/monster/illager/Evoker.java
|
||||||
+++ b/net/minecraft/world/entity/monster/illager/Evoker.java
|
+++ b/net/minecraft/world/entity/monster/illager/Evoker.java
|
||||||
@@ -75,6 +75,13 @@ public class Evoker extends SpellcasterIllager {
|
@@ -75,6 +75,13 @@ public class Evoker extends SpellcasterIllager {
|
||||||
@@ -1227,7 +1227,7 @@ index beba154f2a76d3d8f7d9b44c1b45b83c9dc3b86c..cbbfdd2dde1437955f1007618244eeb7
|
|||||||
public boolean doHurtTarget(final ServerLevel level, final Entity target) {
|
public boolean doHurtTarget(final ServerLevel level, final Entity target) {
|
||||||
if (super.doHurtTarget(level, target)) {
|
if (super.doHurtTarget(level, target)) {
|
||||||
diff --git a/net/minecraft/world/entity/monster/spider/Spider.java b/net/minecraft/world/entity/monster/spider/Spider.java
|
diff --git a/net/minecraft/world/entity/monster/spider/Spider.java b/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
index 696d7fa001de544fd2124b4e1135725547a15a94..43c50e6808eaab4bb31ffbbc633a66bab49b9574 100644
|
index 8834ecb96e3a6ec28f8700b23971d00136f26a4d..467ea1fd09b94747a03aaadd28a107d983afeb01 100644
|
||||||
--- a/net/minecraft/world/entity/monster/spider/Spider.java
|
--- a/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
+++ b/net/minecraft/world/entity/monster/spider/Spider.java
|
+++ b/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
@@ -77,6 +77,13 @@ public class Spider extends Monster {
|
@@ -77,6 +77,13 @@ public class Spider extends Monster {
|
||||||
@@ -1281,7 +1281,7 @@ index c3f2d9ab49eb501f26939387624f326227908b81..8d6262e99fb3ad98d3142ee069f07d23
|
|||||||
public boolean isSunSensitive() {
|
public boolean isSunSensitive() {
|
||||||
return false;
|
return false;
|
||||||
diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||||
index 5bf9970b93e27004dd832c8465dc95a681583ef6..0777e4e0c3aa932699f124c83a571ce913327740 100644
|
index bf94d8e9512eeb294914c748be091f6565cca676..6693ae88aa5780189faba8649346579f5b95b77e 100644
|
||||||
--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
|
--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||||
+++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
+++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||||
@@ -152,6 +152,13 @@ public class Zombie extends Monster {
|
@@ -152,6 +152,13 @@ public class Zombie extends Monster {
|
||||||
@@ -1335,7 +1335,7 @@ index d1edf1f44de1fc6d23bcd8044f8bf4165821790e..6cc4d4729520c60b98d45d5e7dd674e5
|
|||||||
protected void addBehaviourGoals() {
|
protected void addBehaviourGoals() {
|
||||||
this.goalSelector.addGoal(1, new SpearUseGoal<>(this, 1.0, 1.0, 10.0F, 2.0F));
|
this.goalSelector.addGoal(1, new SpearUseGoal<>(this, 1.0, 1.0, 10.0F, 2.0F));
|
||||||
diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
|
diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
index fffc71d2f0cd0d4c4f5d8fad38130208cdbe5e67..fe93e373ea46970af5ca117e80a7d5a2497afeca 100644
|
index 27b2675059795b54b7d217442065bd50618ac7ae..033c9322234378c46e9a6e549d04f32135243ed9 100644
|
||||||
--- a/net/minecraft/world/entity/npc/villager/Villager.java
|
--- a/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
|
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
@@ -284,6 +284,13 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re
|
@@ -284,6 +284,13 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
|
|||||||
Co-authored by: Encode42 <me@encode42.dev>
|
Co-authored by: Encode42 <me@encode42.dev>
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||||
index a812442edc8ef3f53b8e9a071a7e3e864314ae6d..e9fae59a2fffdd4b72e086d846beccf0a5265127 100644
|
index 1ff07b2d360e42a073a6ff0f2a188f320f8376b3..f32ebfa15c4c56eee63c5c520aa6a65faccdc104 100644
|
||||||
--- a/net/minecraft/world/entity/Entity.java
|
--- a/net/minecraft/world/entity/Entity.java
|
||||||
+++ b/net/minecraft/world/entity/Entity.java
|
+++ b/net/minecraft/world/entity/Entity.java
|
||||||
@@ -558,6 +558,21 @@ public abstract class Entity
|
@@ -558,6 +558,21 @@ public abstract class Entity
|
||||||
@@ -32,7 +32,7 @@ index a812442edc8ef3f53b8e9a071a7e3e864314ae6d..e9fae59a2fffdd4b72e086d846beccf0
|
|||||||
this.type = type;
|
this.type = type;
|
||||||
this.level = level;
|
this.level = level;
|
||||||
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
||||||
index bf817c8cf1308a2621f387305b8d29af96a99f7f..b8c805694fae68ed2bcc5470d6ee53c2de6443ab 100644
|
index 5ce6af2b5b22f439aa747d937f0baef7c2479635..6f26248e50eaa14a881b500e396a817b3fd4d9b0 100644
|
||||||
--- a/net/minecraft/world/entity/LivingEntity.java
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
||||||
+++ b/net/minecraft/world/entity/LivingEntity.java
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
||||||
@@ -291,6 +291,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
@@ -291,6 +291,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
||||||
@@ -157,7 +157,7 @@ index 18bfb321e3728d3fa0596da0b86e4b76ced2178a..ab97449bfa5e8b5615e0f2b6b16be2fe
|
|||||||
|
|
||||||
// Purpur start - Configurable entity base attributes
|
// Purpur start - Configurable entity base attributes
|
||||||
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
index 20096d8305bbfc29195834b87245c94096986ec8..6b6eed1c636f2ca65d0cbcd71e96bdd1b2063267 100644
|
index 646ec1cfc192e16939c9e3dac04b77d1429f82e3..0f1081b448ce03498b471f7d3c2ff63deee13268 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Phantom.java
|
--- a/net/minecraft/world/entity/monster/Phantom.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
@@ -53,7 +53,7 @@ public class Phantom extends Mob implements Enemy {
|
@@ -53,7 +53,7 @@ public class Phantom extends Mob implements Enemy {
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ index a3a98df8ffeb33d86330b5561252eda596642da8..85986d2dc0c12a34f990e4262f79f813
|
|||||||
public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
|
public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
|
||||||
return 0.0F;
|
return 0.0F;
|
||||||
diff --git a/net/minecraft/world/entity/animal/bee/Bee.java b/net/minecraft/world/entity/animal/bee/Bee.java
|
diff --git a/net/minecraft/world/entity/animal/bee/Bee.java b/net/minecraft/world/entity/animal/bee/Bee.java
|
||||||
index 4fba5ce59065ac024a0108726623dab894ae45c5..17ec9642772d02092768da5d5a1396d357199268 100644
|
index e85c33e4d0d19d4e7f8ef837ec0a611e19bc19e4..15b48d4b8de0eb2e59667aee9e62c254995e5600 100644
|
||||||
--- a/net/minecraft/world/entity/animal/bee/Bee.java
|
--- a/net/minecraft/world/entity/animal/bee/Bee.java
|
||||||
+++ b/net/minecraft/world/entity/animal/bee/Bee.java
|
+++ b/net/minecraft/world/entity/animal/bee/Bee.java
|
||||||
@@ -502,6 +502,13 @@ public class Bee extends Animal implements FlyingAnimal, NeutralMob {
|
@@ -502,6 +502,13 @@ public class Bee extends Animal implements FlyingAnimal, NeutralMob {
|
||||||
@@ -113,7 +113,7 @@ index d3e5e12c4e3c168a3a15d611f8ae5845ee365080..07a1df530fcd5d684cbba4414ea0fa20
|
|||||||
public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
|
public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
|
||||||
return level.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : level.getPathfindingCostFromLightLevels(pos);
|
return level.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : level.getPathfindingCostFromLightLevels(pos);
|
||||||
diff --git a/net/minecraft/world/entity/animal/dolphin/Dolphin.java b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
diff --git a/net/minecraft/world/entity/animal/dolphin/Dolphin.java b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
||||||
index c372a2cc7ec9ac03629a73a45bfc58f77894d63b..4f39f0213f4af3589ed53c7238c91b4300a3b174 100644
|
index 0cab39846b6ad5d0e0ce627d6a84f73340fcd328..5e966f61ab5a48c6fc7168af3680ab3133d89365 100644
|
||||||
--- a/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
--- a/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
||||||
+++ b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
+++ b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
||||||
@@ -169,6 +169,13 @@ public class Dolphin extends AgeableWaterCreature {
|
@@ -169,6 +169,13 @@ public class Dolphin extends AgeableWaterCreature {
|
||||||
@@ -167,7 +167,7 @@ index 64603ad973bdb697ca75642e8e42e7052efd4191..5d643be94db358e4093cbb00659a4e90
|
|||||||
protected void randomizeAttributes(final RandomSource random) {
|
protected void randomizeAttributes(final RandomSource random) {
|
||||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
|
||||||
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
index e277a58a1c761198f59b987c95567b6e4d9c440b..fe9d0b7bc5ad62a5455a78ffb6cd04a1b8115932 100644
|
index c56d6f3a8a0c5a95da49ab34c72659872259a723..6a59ee64c539c36633ad23c1bcc53cec9426bce5 100644
|
||||||
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
--- a/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
+++ b/net/minecraft/world/entity/animal/equine/Llama.java
|
||||||
@@ -165,6 +165,13 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
@@ -165,6 +165,13 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
||||||
@@ -257,7 +257,7 @@ index 426b468ee821a7441d15dae3634032535cb60725..54cbd5136997bdec34df0f822e21ffe5
|
|||||||
return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 25.0);
|
return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 25.0);
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/animal/feline/Cat.java b/net/minecraft/world/entity/animal/feline/Cat.java
|
diff --git a/net/minecraft/world/entity/animal/feline/Cat.java b/net/minecraft/world/entity/animal/feline/Cat.java
|
||||||
index 0493926c7918059d82bafd20fed0883bb331bd55..74acd2066aa05eb732645912eba7b24252a57f7e 100644
|
index 966b2cbc5b4f71d2cfa8759c2263407ee73c3d8e..d28e2ed6e08b708a8eb17645c8406b5d04110500 100644
|
||||||
--- a/net/minecraft/world/entity/animal/feline/Cat.java
|
--- a/net/minecraft/world/entity/animal/feline/Cat.java
|
||||||
+++ b/net/minecraft/world/entity/animal/feline/Cat.java
|
+++ b/net/minecraft/world/entity/animal/feline/Cat.java
|
||||||
@@ -142,6 +142,13 @@ public class Cat extends TamableAnimal {
|
@@ -142,6 +142,13 @@ public class Cat extends TamableAnimal {
|
||||||
@@ -311,7 +311,7 @@ index f44214eaa47c2021f7ca9c84a7b89be15fecb5bc..7d4bfca8b2608c18fc96e14f1ef91212
|
|||||||
public ItemStack getBucketItemStack() {
|
public ItemStack getBucketItemStack() {
|
||||||
return new ItemStack(Items.COD_BUCKET);
|
return new ItemStack(Items.COD_BUCKET);
|
||||||
diff --git a/net/minecraft/world/entity/animal/fish/Pufferfish.java b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
diff --git a/net/minecraft/world/entity/animal/fish/Pufferfish.java b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
||||||
index 17dba2f70251c2d5f75cc116b300f328f117cecb..3d84c136fa944beed72ee2fb8f441bcb4031e233 100644
|
index a0f1ea76011dc3aa6e8a702528062f5fafe07e01..a6ac30e39b15493cdee194a79d744d85d54ecdde 100644
|
||||||
--- a/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
--- a/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
||||||
+++ b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
+++ b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
||||||
@@ -73,6 +73,13 @@ public class Pufferfish extends AbstractFish {
|
@@ -73,6 +73,13 @@ public class Pufferfish extends AbstractFish {
|
||||||
@@ -365,7 +365,7 @@ index 17bc569bf97026e2c072633f1ad6e9e0102c137a..fc500f1ca1d4280519f418cac21688c3
|
|||||||
return "entity.minecraft.tropical_fish.predefined." + index;
|
return "entity.minecraft.tropical_fish.predefined." + index;
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/animal/fox/Fox.java b/net/minecraft/world/entity/animal/fox/Fox.java
|
diff --git a/net/minecraft/world/entity/animal/fox/Fox.java b/net/minecraft/world/entity/animal/fox/Fox.java
|
||||||
index aa419e7cb456f664c1eca1286777caca6bd10e7a..335da522a9b96ebc852b4ed5f22f9fd71aec23a8 100644
|
index c70e04d20e37b7063618805016d24a459ee65c91..66001fb6a7264e70f3172ea50c97d0a26214a5fd 100644
|
||||||
--- a/net/minecraft/world/entity/animal/fox/Fox.java
|
--- a/net/minecraft/world/entity/animal/fox/Fox.java
|
||||||
+++ b/net/minecraft/world/entity/animal/fox/Fox.java
|
+++ b/net/minecraft/world/entity/animal/fox/Fox.java
|
||||||
@@ -215,6 +215,13 @@ public class Fox extends Animal {
|
@@ -215,6 +215,13 @@ public class Fox extends Animal {
|
||||||
@@ -383,7 +383,7 @@ index aa419e7cb456f664c1eca1286777caca6bd10e7a..335da522a9b96ebc852b4ed5f22f9fd7
|
|||||||
protected void defineSynchedData(final SynchedEntityData.Builder entityData) {
|
protected void defineSynchedData(final SynchedEntityData.Builder entityData) {
|
||||||
super.defineSynchedData(entityData);
|
super.defineSynchedData(entityData);
|
||||||
diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
|
diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
|
||||||
index 0d40bbd8c42178c712f23300364138389ecde548..afc1119a6b562013a09a607ecc430d7bd46e6c82 100644
|
index 24cccc6afadfc91feb6157882c1b76da0d3657d1..ae262e0956a7f468d01a669f827f0c08142804fa 100644
|
||||||
--- a/net/minecraft/world/entity/animal/goat/Goat.java
|
--- a/net/minecraft/world/entity/animal/goat/Goat.java
|
||||||
+++ b/net/minecraft/world/entity/animal/goat/Goat.java
|
+++ b/net/minecraft/world/entity/animal/goat/Goat.java
|
||||||
@@ -131,6 +131,13 @@ public class Goat extends Animal {
|
@@ -131,6 +131,13 @@ public class Goat extends Animal {
|
||||||
@@ -455,7 +455,7 @@ index 2d3127f6846ff9eda1a0b89764dc837da6e7e0c7..ffb0e9cc4f8604fd03cb3a2412001182
|
|||||||
protected void registerGoals() {
|
protected void registerGoals() {
|
||||||
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
|
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
|
||||||
diff --git a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
diff --git a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
||||||
index d3367430da307e2c0748874cbe77f265860152a0..908e26a3aeb843585d9938f588d33b5bb5326ebe 100644
|
index a73d8d3eb04602eac78f142c336e464de22ecc83..aed715317114374213bfb60b18a5bf57632459f8 100644
|
||||||
--- a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
--- a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
||||||
+++ b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
+++ b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
|
||||||
@@ -168,6 +168,13 @@ public class HappyGhast extends Animal {
|
@@ -168,6 +168,13 @@ public class HappyGhast extends Animal {
|
||||||
@@ -509,7 +509,7 @@ index ab97449bfa5e8b5615e0f2b6b16be2fe7e4233fd..869cec108d33626362400e9aa4890a92
|
|||||||
return AbstractNautilus.createAttributes().add(Attributes.MOVEMENT_SPEED, 1.1F);
|
return AbstractNautilus.createAttributes().add(Attributes.MOVEMENT_SPEED, 1.1F);
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/animal/panda/Panda.java b/net/minecraft/world/entity/animal/panda/Panda.java
|
diff --git a/net/minecraft/world/entity/animal/panda/Panda.java b/net/minecraft/world/entity/animal/panda/Panda.java
|
||||||
index f97b8feaedb84baf479998cef7257231f85412d6..72ced157956c6a809d8d9f21027f21c0465b8677 100644
|
index 2f9f588c384d133f82bb4b2d08c8f7c7a72c0915..0480c5851ff94e095bc54106051d0ca4d2db82e0 100644
|
||||||
--- a/net/minecraft/world/entity/animal/panda/Panda.java
|
--- a/net/minecraft/world/entity/animal/panda/Panda.java
|
||||||
+++ b/net/minecraft/world/entity/animal/panda/Panda.java
|
+++ b/net/minecraft/world/entity/animal/panda/Panda.java
|
||||||
@@ -160,6 +160,13 @@ public class Panda extends Animal {
|
@@ -160,6 +160,13 @@ public class Panda extends Animal {
|
||||||
@@ -599,7 +599,7 @@ index 7dade80db9430e4db587ed23df992d70c6b7ee04..937ce47e45698392fad3fdc6eeb85e78
|
|||||||
public void registerGoals() {
|
public void registerGoals() {
|
||||||
this.goalSelector.addGoal(1, new FloatGoal(this));
|
this.goalSelector.addGoal(1, new FloatGoal(this));
|
||||||
diff --git a/net/minecraft/world/entity/animal/sheep/Sheep.java b/net/minecraft/world/entity/animal/sheep/Sheep.java
|
diff --git a/net/minecraft/world/entity/animal/sheep/Sheep.java b/net/minecraft/world/entity/animal/sheep/Sheep.java
|
||||||
index 0ceaa6dd493d0258c419d8b5c4394b35c0808704..55cc6040e606918042c76a7bc6cbe1a1b965c407 100644
|
index 49389028a34971bbd1c480ba91e2b53d3c26513c..f0ff3484c73b2348e7b2239517c8984422cd1bdd 100644
|
||||||
--- a/net/minecraft/world/entity/animal/sheep/Sheep.java
|
--- a/net/minecraft/world/entity/animal/sheep/Sheep.java
|
||||||
+++ b/net/minecraft/world/entity/animal/sheep/Sheep.java
|
+++ b/net/minecraft/world/entity/animal/sheep/Sheep.java
|
||||||
@@ -102,6 +102,13 @@ public class Sheep extends Animal implements Shearable {
|
@@ -102,6 +102,13 @@ public class Sheep extends Animal implements Shearable {
|
||||||
@@ -635,7 +635,7 @@ index 1fa3d614dd1c45ec42caffbe92e3f8db02b399b1..0f4587df333a68627d6db18c0583ae1e
|
|||||||
protected ParticleOptions getInkParticle() {
|
protected ParticleOptions getInkParticle() {
|
||||||
return ParticleTypes.GLOW_SQUID_INK;
|
return ParticleTypes.GLOW_SQUID_INK;
|
||||||
diff --git a/net/minecraft/world/entity/animal/squid/Squid.java b/net/minecraft/world/entity/animal/squid/Squid.java
|
diff --git a/net/minecraft/world/entity/animal/squid/Squid.java b/net/minecraft/world/entity/animal/squid/Squid.java
|
||||||
index e350763a3a22d825a25f02b60bd4c9223aa81f62..0a3327e22f5a2e30c70248ab46078e50281bd429 100644
|
index 8b26b08956e63d3ccb9a7006cfa57ac3771339ad..3f197daef44cafb00390d0e429eceae8505d9c1d 100644
|
||||||
--- a/net/minecraft/world/entity/animal/squid/Squid.java
|
--- a/net/minecraft/world/entity/animal/squid/Squid.java
|
||||||
+++ b/net/minecraft/world/entity/animal/squid/Squid.java
|
+++ b/net/minecraft/world/entity/animal/squid/Squid.java
|
||||||
@@ -111,6 +111,13 @@ public class Squid extends AgeableWaterCreature {
|
@@ -111,6 +111,13 @@ public class Squid extends AgeableWaterCreature {
|
||||||
@@ -671,7 +671,7 @@ index 6d09c0de38f2c91d2a0ab6dd0b694ab42b48a981..37345edf599a43ac48274e30f5d7aa34
|
|||||||
this.homePos = pos;
|
this.homePos = pos;
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/animal/wolf/Wolf.java b/net/minecraft/world/entity/animal/wolf/Wolf.java
|
diff --git a/net/minecraft/world/entity/animal/wolf/Wolf.java b/net/minecraft/world/entity/animal/wolf/Wolf.java
|
||||||
index 781cac493f909b02483e5c4064cc2cc791b1dabd..fed2456921421eb6c95a4d713a4bd0ed64c1415a 100644
|
index cd7981c9c040e1b745e08680bf3685903cbda8ff..12f7874e28ae964c7d68bee4a4c3ac0a47b369ba 100644
|
||||||
--- a/net/minecraft/world/entity/animal/wolf/Wolf.java
|
--- a/net/minecraft/world/entity/animal/wolf/Wolf.java
|
||||||
+++ b/net/minecraft/world/entity/animal/wolf/Wolf.java
|
+++ b/net/minecraft/world/entity/animal/wolf/Wolf.java
|
||||||
@@ -227,6 +227,13 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
@@ -227,6 +227,13 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||||
@@ -689,7 +689,7 @@ index 781cac493f909b02483e5c4064cc2cc791b1dabd..fed2456921421eb6c95a4d713a4bd0ed
|
|||||||
protected void registerGoals() {
|
protected void registerGoals() {
|
||||||
this.goalSelector.addGoal(1, new FloatGoal(this));
|
this.goalSelector.addGoal(1, new FloatGoal(this));
|
||||||
diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||||
index 10818999c4e796a4dfd5a7dd21772c9eb8ca2579..4677996d778fbd1ffa7c1278bf4ebd8ce1097eb9 100644
|
index 5e206030d9ccabbefe9c64332125526030d65750..a94d2d9bc5a5795a0c88348a61dff936d31d12b5 100644
|
||||||
--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||||
+++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
+++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||||
@@ -229,6 +229,13 @@ public class WitherBoss extends Monster implements RangedAttackMob {
|
@@ -229,6 +229,13 @@ public class WitherBoss extends Monster implements RangedAttackMob {
|
||||||
@@ -797,7 +797,7 @@ index 859d490dd3be2843dde3a811bcc0d51e3eae76f0..b93a5d46ccf7b2dad6afbd15884f8d8a
|
|||||||
protected void registerGoals() {
|
protected void registerGoals() {
|
||||||
this.goalSelector.addGoal(1, new FloatGoal(this));
|
this.goalSelector.addGoal(1, new FloatGoal(this));
|
||||||
diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java
|
diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java
|
||||||
index 89a2097c2c26dae7f12ddbac10bc091ec7f228d7..753ba768318b2ecda5efdbd00b408aa7e1b2c56b 100644
|
index 64800fe5cfb3488b63126ed09f1f678d6ebd1d3b..b87ee7a7b92f49b72151019bf05995a6843ec7fa 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Ghast.java
|
--- a/net/minecraft/world/entity/monster/Ghast.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Ghast.java
|
+++ b/net/minecraft/world/entity/monster/Ghast.java
|
||||||
@@ -90,6 +90,13 @@ public class Ghast extends Mob implements Enemy {
|
@@ -90,6 +90,13 @@ public class Ghast extends Mob implements Enemy {
|
||||||
@@ -833,7 +833,7 @@ index 43ebfe06ce2a8c15787d72a8ef54cd6c7cac2bfc..07dfe0e6fd431b8417fc7f823962e4d4
|
|||||||
return Monster.createMonsterAttributes()
|
return Monster.createMonsterAttributes()
|
||||||
.add(Attributes.MAX_HEALTH, 100.0)
|
.add(Attributes.MAX_HEALTH, 100.0)
|
||||||
diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java
|
diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java
|
||||||
index 9ca62d9663fc2e8eb49780ceb7ff38e0363a09a6..ef66a8e8973e0af6a3826b7b6819b9bf89af86dd 100644
|
index ea7e6a1b4dad1b702ddc5b6004c5ebdfd541334d..520e9e7e99c03f07087bd51d19db730aa98cd6b9 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Guardian.java
|
--- a/net/minecraft/world/entity/monster/Guardian.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Guardian.java
|
+++ b/net/minecraft/world/entity/monster/Guardian.java
|
||||||
@@ -104,6 +104,13 @@ public class Guardian extends Monster {
|
@@ -104,6 +104,13 @@ public class Guardian extends Monster {
|
||||||
@@ -869,7 +869,7 @@ index fba41f261e57a050d4e24d2611cc27edcbb84ddf..4e757fc7d49c22f79eceafc02ff05da5
|
|||||||
return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
|
return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
index 6b6eed1c636f2ca65d0cbcd71e96bdd1b2063267..2b799c73bb384bdb778edda66bbb00c4ba70a2bf 100644
|
index 0f1081b448ce03498b471f7d3c2ff63deee13268..05ae5d0a41cf0f3c4bb2da1395e64b31f45418ae 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Phantom.java
|
--- a/net/minecraft/world/entity/monster/Phantom.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
+++ b/net/minecraft/world/entity/monster/Phantom.java
|
||||||
@@ -137,6 +137,13 @@ public class Phantom extends Mob implements Enemy {
|
@@ -137,6 +137,13 @@ public class Phantom extends Mob implements Enemy {
|
||||||
@@ -887,7 +887,7 @@ index 6b6eed1c636f2ca65d0cbcd71e96bdd1b2063267..2b799c73bb384bdb778edda66bbb00c4
|
|||||||
public boolean isFlapping() {
|
public boolean isFlapping() {
|
||||||
return (this.getUniqueFlapTickOffset() + this.tickCount) % TICKS_PER_FLAP == 0;
|
return (this.getUniqueFlapTickOffset() + this.tickCount) % TICKS_PER_FLAP == 0;
|
||||||
diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
|
diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
|
||||||
index bb19e3f2e6522e8b7db32061c0ae2b2a37679369..8dc443aa7847789117f6cb86415d6dd082a93e2f 100644
|
index 3e0403635cb9ce3d0894705db6727d9a7cc4d628..700799d2cedea989ac60d7c5dfc563c99db9f537 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Ravager.java
|
--- a/net/minecraft/world/entity/monster/Ravager.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Ravager.java
|
+++ b/net/minecraft/world/entity/monster/Ravager.java
|
||||||
@@ -108,6 +108,13 @@ public class Ravager extends Raider {
|
@@ -108,6 +108,13 @@ public class Ravager extends Raider {
|
||||||
@@ -905,7 +905,7 @@ index bb19e3f2e6522e8b7db32061c0ae2b2a37679369..8dc443aa7847789117f6cb86415d6dd0
|
|||||||
protected void registerGoals() {
|
protected void registerGoals() {
|
||||||
super.registerGoals();
|
super.registerGoals();
|
||||||
diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
|
diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
|
||||||
index cf49a580c8dacb895b7a8ec2531d3afee2ffc30c..62bf636b9fb0f13ef7d5787001df0902719bcadf 100644
|
index 67aa12ee4a58e7cd31efb47cd1d71eaa2cc6af7d..0224a0dca4432fa33262ffa7152eb228a88c20d5 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Shulker.java
|
--- a/net/minecraft/world/entity/monster/Shulker.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Shulker.java
|
+++ b/net/minecraft/world/entity/monster/Shulker.java
|
||||||
@@ -142,6 +142,13 @@ public class Shulker extends AbstractGolem implements Enemy {
|
@@ -142,6 +142,13 @@ public class Shulker extends AbstractGolem implements Enemy {
|
||||||
@@ -941,7 +941,7 @@ index 205c05f46d70d37e11a0e35c97128e0c20b94e23..b45f8eb2bd1d9b3c91716bf329febe92
|
|||||||
protected void registerGoals() {
|
protected void registerGoals() {
|
||||||
this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
|
this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
|
||||||
diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
|
diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
|
||||||
index 556930ac4d06b4f46a87d237857006729fea5ef5..dd21ca5047d16af2d7ed28c97976d845eab1b470 100644
|
index 834125d0ded28a1d7a39a3e5fcf6a5bb967c7f91..0636fdf31330da5523b9ad11869776a21a6f68b1 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Slime.java
|
--- a/net/minecraft/world/entity/monster/Slime.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Slime.java
|
+++ b/net/minecraft/world/entity/monster/Slime.java
|
||||||
@@ -142,6 +142,13 @@ public class Slime extends Mob implements Enemy {
|
@@ -142,6 +142,13 @@ public class Slime extends Mob implements Enemy {
|
||||||
@@ -977,7 +977,7 @@ index 1b6137674d807ed29d56e3f3120abe60254274e1..7c05c394138699c199e2044325d29482
|
|||||||
final EntityType<Strider> ignoredType,
|
final EntityType<Strider> ignoredType,
|
||||||
final LevelAccessor level,
|
final LevelAccessor level,
|
||||||
diff --git a/net/minecraft/world/entity/monster/Vex.java b/net/minecraft/world/entity/monster/Vex.java
|
diff --git a/net/minecraft/world/entity/monster/Vex.java b/net/minecraft/world/entity/monster/Vex.java
|
||||||
index c7700ff6b7faf06116626ad95e11cd4604751eda..97177c9f1982e348e4987f254a9daeeac5da1cbe 100644
|
index 917f256f072ba29ae77e4976dd4d49ffcb2a0e35..d280201dfdd5c6114a00d5d245d839d271177854 100644
|
||||||
--- a/net/minecraft/world/entity/monster/Vex.java
|
--- a/net/minecraft/world/entity/monster/Vex.java
|
||||||
+++ b/net/minecraft/world/entity/monster/Vex.java
|
+++ b/net/minecraft/world/entity/monster/Vex.java
|
||||||
@@ -118,6 +118,13 @@ public class Vex extends Monster implements TraceableEntity {
|
@@ -118,6 +118,13 @@ public class Vex extends Monster implements TraceableEntity {
|
||||||
@@ -1049,7 +1049,7 @@ index d001cf955dba66435079eb2cc30e05aec963d2c6..b8c764cc274f43073a460a4c8643e0cb
|
|||||||
public void setTimeInOverworld(final int timeInOverworld) {
|
public void setTimeInOverworld(final int timeInOverworld) {
|
||||||
this.timeInOverworld = timeInOverworld;
|
this.timeInOverworld = timeInOverworld;
|
||||||
diff --git a/net/minecraft/world/entity/monster/illager/Evoker.java b/net/minecraft/world/entity/monster/illager/Evoker.java
|
diff --git a/net/minecraft/world/entity/monster/illager/Evoker.java b/net/minecraft/world/entity/monster/illager/Evoker.java
|
||||||
index 75276deb3208437fce669f9e483ff6c7a99d69a3..452ed8d77c84c26c711531f36f47e84b7379361f 100644
|
index a766f1139459488accd0d720be3ff522e88c3d09..c5d56a3c2dff087453d56821ef6c4d75c1274613 100644
|
||||||
--- a/net/minecraft/world/entity/monster/illager/Evoker.java
|
--- a/net/minecraft/world/entity/monster/illager/Evoker.java
|
||||||
+++ b/net/minecraft/world/entity/monster/illager/Evoker.java
|
+++ b/net/minecraft/world/entity/monster/illager/Evoker.java
|
||||||
@@ -82,6 +82,13 @@ public class Evoker extends SpellcasterIllager {
|
@@ -82,6 +82,13 @@ public class Evoker extends SpellcasterIllager {
|
||||||
@@ -1229,7 +1229,7 @@ index cbbfdd2dde1437955f1007618244eeb72768b8fd..24b5ba31c92923545d5b7cab758c2e30
|
|||||||
public boolean doHurtTarget(final ServerLevel level, final Entity target) {
|
public boolean doHurtTarget(final ServerLevel level, final Entity target) {
|
||||||
if (super.doHurtTarget(level, target)) {
|
if (super.doHurtTarget(level, target)) {
|
||||||
diff --git a/net/minecraft/world/entity/monster/spider/Spider.java b/net/minecraft/world/entity/monster/spider/Spider.java
|
diff --git a/net/minecraft/world/entity/monster/spider/Spider.java b/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
index 43c50e6808eaab4bb31ffbbc633a66bab49b9574..408bfd276b7a70103ede33f3b87d4dc1b10d34f5 100644
|
index 467ea1fd09b94747a03aaadd28a107d983afeb01..8396b9d6b41e381e040ee71e7fe04ad20af63039 100644
|
||||||
--- a/net/minecraft/world/entity/monster/spider/Spider.java
|
--- a/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
+++ b/net/minecraft/world/entity/monster/spider/Spider.java
|
+++ b/net/minecraft/world/entity/monster/spider/Spider.java
|
||||||
@@ -84,6 +84,13 @@ public class Spider extends Monster {
|
@@ -84,6 +84,13 @@ public class Spider extends Monster {
|
||||||
@@ -1283,7 +1283,7 @@ index 02e935edd7a6cabbf2e6fcc6c96a9601bee71acc..5d60b230eeaec9d37e286019b8d4276c
|
|||||||
public boolean isSunSensitive() {
|
public boolean isSunSensitive() {
|
||||||
return this.shouldBurnInDay; // Purpur - moved to LivingEntity; keep methods for ABI compatibility - API for any mob to burn daylight
|
return this.shouldBurnInDay; // Purpur - moved to LivingEntity; keep methods for ABI compatibility - API for any mob to burn daylight
|
||||||
diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||||
index dffb152543d06380618c36cf89374b7d11336039..68070943966aac17e1878f6730781cf2b603be7a 100644
|
index f8eccfab70e7d99dd74965a506837e620515b6d1..cb1a685b136f06ab5884c269678cc9384af1dfed 100644
|
||||||
--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
|
--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||||
+++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
+++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||||
@@ -160,6 +160,13 @@ public class Zombie extends Monster {
|
@@ -160,6 +160,13 @@ public class Zombie extends Monster {
|
||||||
@@ -1337,7 +1337,7 @@ index 6cc4d4729520c60b98d45d5e7dd674e599616505..9e893c0c033dcc2273275b92048d9b1a
|
|||||||
protected void addBehaviourGoals() {
|
protected void addBehaviourGoals() {
|
||||||
this.goalSelector.addGoal(1, new SpearUseGoal<>(this, 1.0, 1.0, 10.0F, 2.0F));
|
this.goalSelector.addGoal(1, new SpearUseGoal<>(this, 1.0, 1.0, 10.0F, 2.0F));
|
||||||
diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
|
diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
index fe93e373ea46970af5ca117e80a7d5a2497afeca..297eba0bcf340f83c5d12ced343ccbfc738d4d35 100644
|
index 033c9322234378c46e9a6e549d04f32135243ed9..f439a0b0830e74be8c123a5b2e55933671715f74 100644
|
||||||
--- a/net/minecraft/world/entity/npc/villager/Villager.java
|
--- a/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
|
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
|
||||||
@@ -291,6 +291,13 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re
|
@@ -291,6 +291,13 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re
|
||||||
|
|||||||
@@ -98,7 +98,7 @@
|
|||||||
+
|
+
|
||||||
+ if (attackDamage.doubleValue() == 0.0D) {
|
+ if (attackDamage.doubleValue() == 0.0D) {
|
||||||
+ // One punch!
|
+ // One punch!
|
||||||
+ damage = 9999F;
|
+ damage = this.getHealth();
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ index 18709cf2d7d69dc8f4313eca0c0358f60f58b16b..fe9d7ecfec87a8914edb32561210ced9
|
|||||||
+ // Purpur end - API for any mob to burn daylight
|
+ // Purpur end - API for any mob to burn daylight
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
||||||
index cabdcbef0e6f7ca41ff5677bc2e6a81665ca812d..c47ca9ab164b6abd28e979c94456918162e49214 100644
|
index db0e625d8ba721b0ad6913fe4a11ed8eb939d344..ecba9986915abdf59e8a71252949b6e47b55ed89 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
||||||
@@ -35,12 +35,12 @@ public class CraftPhantom extends CraftMob implements Phantom, CraftEnemy {
|
@@ -35,12 +35,12 @@ public class CraftPhantom extends CraftMob implements Phantom, CraftEnemy {
|
||||||
|
|||||||
Reference in New Issue
Block a user