SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.20.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-09-22 02:40:00 +10:00
parent 193398c0ff
commit 8a3c8cfcd4
238 changed files with 2448 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityAnimal.patch
View File

@@ -35,7 +35,7 @@
}
}
@@ -175,10 +187,17 @@
@@ -170,10 +182,17 @@
}
public void setInLove(@Nullable EntityHuman entityhuman) {
@@ -54,7 +54,7 @@
this.level().broadcastEntityEvent(this, (byte) 18);
}
@@ -220,12 +239,29 @@
@@ -215,12 +234,29 @@
if (entityageable != null) {
entityageable.setBaby(true);
entityageable.moveTo(this.getX(), this.getY(), this.getZ(), 0.0F, 0.0F);
@@ -86,7 +86,7 @@
Optional.ofNullable(this.getLoveCause()).or(() -> {
return Optional.ofNullable(entityanimal.getLoveCause());
}).ifPresent((entityplayer) -> {
@@ -238,7 +274,11 @@
@@ -233,7 +269,11 @@
entityanimal.resetLove();
worldserver.broadcastEntityEvent(this, (byte) 18);
if (worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {

8
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCat.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/EntityCat.java
+++ b/net/minecraft/world/entity/animal/EntityCat.java
@@ -412,7 +412,7 @@
@@ -413,7 +413,7 @@
}
} else if (this.isFood(itemstack)) {
this.usePlayerItem(entityhuman, enumhand, itemstack);
@@ -9,7 +9,7 @@
this.tame(entityhuman);
this.setOrderedToSit(true);
this.level().broadcastEntityEvent(this, (byte) 7);
@@ -469,7 +469,7 @@
@@ -475,7 +475,7 @@
private static class PathfinderGoalTemptChance extends PathfinderGoalTempt {
@Nullable
@@ -18,7 +18,7 @@
private final EntityCat cat;
public PathfinderGoalTemptChance(EntityCat entitycat, double d0, RecipeItemStack recipeitemstack, boolean flag) {
@@ -610,7 +610,15 @@
@@ -616,7 +616,15 @@
while (iterator.hasNext()) {
ItemStack itemstack = (ItemStack) iterator.next();
@@ -35,7 +35,7 @@
}
}
@@ -642,10 +650,10 @@
@@ -648,10 +656,10 @@
private final EntityCat cat;
public a(EntityCat entitycat, Class<T> oclass, float f, double d0, double d1) {

2
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityChicken.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/EntityChicken.java
+++ b/net/minecraft/world/entity/animal/EntityChicken.java
@@ -96,7 +96,9 @@
@@ -97,7 +97,9 @@
this.flap += this.flapping * 2.0F;
if (!this.level().isClientSide && this.isAlive() && !this.isBaby() && !this.isChickenJockey() && --this.eggTime <= 0) {
this.playSound(SoundEffects.CHICKEN_EGG, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F);

6
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityCow.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/animal/EntityCow.java
+++ b/net/minecraft/world/entity/animal/EntityCow.java
@@ -31,6 +31,12 @@
import net.minecraft.world.level.World;
@@ -33,6 +33,12 @@
import net.minecraft.world.level.block.state.IBlockData;
import org.joml.Vector3f;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -13,7 +13,7 @@
public class EntityCow extends EntityAnimal {
public EntityCow(EntityTypes<? extends EntityCow> entitytypes, World world) {
@@ -83,8 +89,16 @@
@@ -85,8 +91,16 @@
ItemStack itemstack = entityhuman.getItemInHand(enumhand);
if (itemstack.is(Items.BUCKET) && !this.isBaby()) {

10
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityFox.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/EntityFox.java
+++ b/net/minecraft/world/entity/animal/EntityFox.java
@@ -517,7 +517,8 @@
@@ -523,7 +523,8 @@
protected void pickUpItem(EntityItem entityitem) {
ItemStack itemstack = entityitem.getItem();
@@ -10,7 +10,7 @@
int i = itemstack.getCount();
if (i > 1) {
@@ -872,6 +873,16 @@
@@ -883,6 +884,16 @@
if (entityplayer1 != null && entityplayer != entityplayer1) {
entityfox.addTrustedUUID(entityplayer1.getUUID());
}
@@ -27,7 +27,7 @@
if (entityplayer2 != null) {
entityplayer2.awardStat(StatisticList.ANIMALS_BRED);
@@ -882,12 +893,14 @@
@@ -893,12 +904,14 @@
this.partner.setAge(6000);
this.animal.resetLove();
this.partner.resetLove();
@@ -46,7 +46,7 @@
}
}
@@ -1285,6 +1298,11 @@
@@ -1294,6 +1307,11 @@
int i = (Integer) iblockdata.getValue(BlockSweetBerryBush.AGE);
iblockdata.setValue(BlockSweetBerryBush.AGE, 1);
@@ -58,7 +58,7 @@
int j = 1 + EntityFox.this.level().random.nextInt(2) + (i == 3 ? 1 : 0);
ItemStack itemstack = EntityFox.this.getItemBySlot(EnumItemSlot.MAINHAND);
@@ -1441,7 +1459,7 @@
@@ -1451,7 +1469,7 @@
private EntityLiving trustedLastHurt;
private int timestamp;

8
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityMushroomCow.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/animal/EntityMushroomCow.java
+++ b/net/minecraft/world/entity/animal/EntityMushroomCow.java
@@ -42,6 +42,13 @@
import net.minecraft.world.level.block.state.IBlockData;
import net.minecraft.world.level.gameevent.GameEvent;
import org.apache.commons.lang3.tuple.Pair;
+// CraftBukkit start
+import org.bukkit.Bukkit;
@@ -14,7 +14,7 @@
public class EntityMushroomCow extends EntityCow implements IShearable, VariantHolder<EntityMushroomCow.Type> {
private static final DataWatcherObject<String> DATA_TYPE = DataWatcher.defineId(EntityMushroomCow.class, DataWatcherRegistry.STRING);
@@ -115,6 +122,11 @@
@@ -114,6 +121,11 @@
this.playSound(soundeffect, 1.0F, 1.0F);
return EnumInteractionResult.sidedSuccess(this.level().isClientSide);
} else if (itemstack.is(Items.SHEARS) && this.readyForShearing()) {
@@ -26,7 +26,7 @@
this.shear(SoundCategory.PLAYERS);
this.gameEvent(GameEvent.SHEAR, entityhuman);
if (!this.level().isClientSide) {
@@ -165,7 +177,7 @@
@@ -161,7 +173,7 @@
if (entitycow != null) {
((WorldServer) this.level()).sendParticles(Particles.EXPLOSION, this.getX(), this.getY(0.5D), this.getZ(), 1, 0.0D, 0.0D, 0.0D, 0.0D);
@@ -35,7 +35,7 @@
entitycow.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
entitycow.setHealth(this.getHealth());
entitycow.yBodyRot = this.yBodyRot;
@@ -179,10 +191,25 @@
@@ -175,10 +187,25 @@
}
entitycow.setInvulnerable(this.isInvulnerable());

4
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityOcelot.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/EntityOcelot.java
+++ b/net/minecraft/world/entity/animal/EntityOcelot.java
@@ -177,7 +177,7 @@
@@ -179,7 +179,7 @@
if ((this.temptGoal == null || this.temptGoal.isRunning()) && !this.isTrusting() && this.isFood(itemstack) && entityhuman.distanceToSqr((Entity) this) < 9.0D) {
this.usePlayerItem(entityhuman, enumhand, itemstack);
if (!this.level().isClientSide) {
@@ -9,7 +9,7 @@
this.setTrusting(true);
this.spawnTrustingParticles(true);
this.level().broadcastEntityEvent(this, (byte) 41);
@@ -308,10 +308,10 @@
@@ -315,10 +315,10 @@
private final EntityOcelot ocelot;
public a(EntityOcelot entityocelot, Class<T> oclass, float f, double d0, double d1) {

10
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPanda.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/animal/EntityPanda.java
+++ b/net/minecraft/world/entity/animal/EntityPanda.java
@@ -65,6 +65,11 @@
import net.minecraft.world.level.gameevent.GameEvent;
@@ -67,6 +67,11 @@
import net.minecraft.world.phys.Vec3D;
import org.joml.Vector3f;
+// CraftBukkit start;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -12,7 +12,7 @@
public class EntityPanda extends EntityAnimal {
private static final DataWatcherObject<Integer> UNHAPPY_COUNTER = DataWatcher.defineId(EntityPanda.class, DataWatcherRegistry.INT);
@@ -532,7 +537,7 @@
@@ -534,7 +539,7 @@
@Override
protected void pickUpItem(EntityItem entityitem) {
@@ -21,7 +21,7 @@
this.onItemPickup(entityitem);
ItemStack itemstack = entityitem.getItem();
@@ -863,10 +868,10 @@
@@ -870,10 +875,10 @@
private final EntityPanda panda;
public c(EntityPanda entitypanda, Class<T> oclass, float f, double d0, double d1) {
@@ -35,7 +35,7 @@
this.panda = entitypanda;
}
@@ -1105,7 +1110,7 @@
@@ -1112,7 +1117,7 @@
@Override
protected void alertOther(EntityInsentient entityinsentient, EntityLiving entityliving) {
if (entityinsentient instanceof EntityPanda && entityinsentient.isAggressive()) {

8
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityParrot.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/EntityParrot.java
+++ b/net/minecraft/world/entity/animal/EntityParrot.java
@@ -261,7 +261,7 @@
@@ -262,7 +262,7 @@
}
if (!this.level().isClientSide) {
@@ -9,7 +9,7 @@
this.tame(entityhuman);
this.level().broadcastEntityEvent(this, (byte) 7);
} else {
@@ -275,7 +275,7 @@
@@ -276,7 +276,7 @@
itemstack.shrink(1);
}
@@ -18,7 +18,7 @@
if (entityhuman.isCreative() || !this.isInvulnerable()) {
this.hurt(this.damageSources().playerAttack(entityhuman), Float.MAX_VALUE);
}
@@ -382,7 +382,7 @@
@@ -383,7 +383,7 @@
@Override
public boolean isPushable() {
@@ -27,7 +27,7 @@
}
@Override
@@ -397,11 +397,14 @@
@@ -398,11 +398,14 @@
if (this.isInvulnerableTo(damagesource)) {
return false;
} else {

6
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityPig.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/animal/EntityPig.java
+++ b/net/minecraft/world/entity/animal/EntityPig.java
@@ -49,6 +49,10 @@
import net.minecraft.world.phys.AxisAlignedBB;
@@ -51,6 +51,10 @@
import net.minecraft.world.phys.Vec3D;
import org.joml.Vector3f;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -11,7 +11,7 @@
public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
private static final DataWatcherObject<Boolean> DATA_SADDLE_ID = DataWatcher.defineId(EntityPig.class, DataWatcherRegistry.BOOLEAN);
@@ -250,7 +254,13 @@
@@ -252,7 +256,13 @@
}
entitypigzombie.setPersistenceRequired();

8
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityRabbit.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/EntityRabbit.java
+++ b/net/minecraft/world/entity/animal/EntityRabbit.java
@@ -66,6 +66,10 @@
@@ -67,6 +67,10 @@
import net.minecraft.world.level.pathfinder.PathEntity;
import net.minecraft.world.phys.Vec3D;
@@ -11,7 +11,7 @@
public class EntityRabbit extends EntityAnimal implements VariantHolder<EntityRabbit.Variant> {
public static final double STROLL_SPEED_MOD = 0.6D;
@@ -88,7 +92,6 @@
@@ -89,7 +93,6 @@
super(entitytypes, world);
this.jumpControl = new EntityRabbit.ControllerJumpRabbit(this);
this.moveControl = new EntityRabbit.ControllerMoveRabbit(this);
@@ -19,7 +19,7 @@
}
@Override
@@ -576,9 +579,19 @@
@@ -577,9 +580,19 @@
int i = (Integer) iblockdata.getValue(BlockCarrots.AGE);
if (i == 0) {
@@ -37,5 +37,5 @@
+ }
+ // CraftBukkit end
world.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockCarrots.AGE, i - 1), 2);
world.gameEvent(GameEvent.BLOCK_CHANGE, blockposition, GameEvent.a.of((Entity) this.rabbit));
world.levelEvent(2001, blockposition, Block.getId(iblockdata));
}

20
paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySheep.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/animal/EntitySheep.java
+++ b/net/minecraft/world/entity/animal/EntitySheep.java
@@ -64,6 +64,14 @@
import net.minecraft.world.level.gameevent.GameEvent;
@@ -66,6 +66,14 @@
import net.minecraft.world.level.storage.loot.LootTables;
import org.joml.Vector3f;
+// CraftBukkit start
+import net.minecraft.world.inventory.InventoryCraftResult;
@@ -15,7 +15,7 @@
public class EntitySheep extends EntityAnimal implements IShearable {
private static final int EAT_ANIMATION_TICKS = 40;
@@ -244,6 +252,11 @@
@@ -246,6 +254,11 @@
if (itemstack.is(Items.SHEARS)) {
if (!this.level().isClientSide && this.readyForShearing()) {
@@ -27,7 +27,7 @@
this.shear(SoundCategory.PLAYERS);
this.gameEvent(GameEvent.SHEAR, entityhuman);
itemstack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
@@ -265,7 +278,9 @@
@@ -267,7 +280,9 @@
int i = 1 + this.random.nextInt(3);
for (int j = 0; j < i; ++j) {
@@ -37,7 +37,7 @@
if (entityitem != null) {
entityitem.setDeltaMovement(entityitem.getDeltaMovement().add((double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F), (double) (this.random.nextFloat() * 0.05F), (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F)));
@@ -358,6 +373,12 @@
@@ -360,6 +375,12 @@
@Override
public void ate() {
@@ -50,16 +50,16 @@
super.ate();
this.setSheared(false);
if (this.isBaby()) {
@@ -377,7 +398,7 @@
@@ -379,7 +400,7 @@
EnumColor enumcolor = ((EntitySheep) entityanimal).getColor();
EnumColor enumcolor1 = ((EntitySheep) entityanimal1).getColor();
InventoryCrafting inventorycrafting = makeContainer(enumcolor, enumcolor1);
- Optional optional = this.level().getRecipeManager().getRecipeFor(Recipes.CRAFTING, inventorycrafting, this.level()).map((recipecrafting) -> {
+ Optional<Item> optional = this.level().getRecipeManager().getRecipeFor(Recipes.CRAFTING, inventorycrafting, this.level()).map((recipecrafting) -> { // CraftBukkit - decompile error
return recipecrafting.assemble(inventorycrafting, this.level().registryAccess());
- Optional optional = this.level().getRecipeManager().getRecipeFor(Recipes.CRAFTING, inventorycrafting, this.level()).map((recipeholder) -> {
+ Optional<Item> optional = this.level().getRecipeManager().getRecipeFor(Recipes.CRAFTING, inventorycrafting, this.level()).map((recipeholder) -> { // CraftBukkit - decompile error
return ((RecipeCrafting) recipeholder.value()).assemble(inventorycrafting, this.level().registryAccess());
}).map(ItemStack::getItem);
@@ -400,10 +421,18 @@
@@ -402,10 +423,18 @@
public boolean stillValid(EntityHuman entityhuman) {
return false;
}

8
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityTurtle.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/EntityTurtle.java
+++ b/net/minecraft/world/entity/animal/EntityTurtle.java
@@ -308,7 +308,9 @@
@@ -312,7 +312,9 @@
protected void ageBoundaryReached() {
super.ageBoundaryReached();
if (!this.isBaby() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -10,7 +10,7 @@
}
}
@@ -335,7 +337,9 @@
@@ -339,7 +341,9 @@
@Override
public void thunderHit(WorldServer worldserver, EntityLightning entitylightning) {
@@ -19,8 +19,8 @@
+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit
}
private static class e extends ControllerMove {
@@ -487,12 +491,14 @@
@Override
@@ -496,12 +500,14 @@
} else if (this.turtle.layEggCounter > this.adjustedTickDelay(200)) {
World world = this.turtle.level();

14
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityWolf.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/animal/EntityWolf.java
+++ b/net/minecraft/world/entity/animal/EntityWolf.java
@@ -69,6 +69,12 @@
import net.minecraft.world.level.pathfinder.PathType;
@@ -70,6 +70,12 @@
import net.minecraft.world.phys.Vec3D;
import org.joml.Vector3f;
+// CraftBukkit start
+import org.bukkit.event.entity.EntityRegainHealthEvent;
@@ -13,7 +13,7 @@
public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable {
private static final DataWatcherObject<Boolean> DATA_INTERESTED_ID = DataWatcher.defineId(EntityWolf.class, DataWatcherRegistry.BOOLEAN);
@@ -297,15 +303,19 @@
@@ -298,15 +304,19 @@
} else {
Entity entity = damagesource.getEntity();
@@ -37,7 +37,7 @@
}
}
@@ -325,7 +335,7 @@
@@ -326,7 +336,7 @@
super.setTame(flag);
if (flag) {
this.getAttribute(GenericAttributes.MAX_HEALTH).setBaseValue(20.0D);
@@ -46,7 +46,7 @@
} else {
this.getAttribute(GenericAttributes.MAX_HEALTH).setBaseValue(8.0D);
}
@@ -348,7 +358,7 @@
@@ -349,7 +359,7 @@
itemstack.shrink(1);
}
@@ -55,7 +55,7 @@
return EnumInteractionResult.SUCCESS;
} else {
if (item instanceof ItemDye) {
@@ -376,7 +386,7 @@
@@ -377,7 +387,7 @@
this.setOrderedToSit(!this.isOrderedToSit());
this.jumping = false;
this.navigation.stop();
@@ -64,7 +64,7 @@
return EnumInteractionResult.SUCCESS;
} else {
return enuminteractionresult;
@@ -387,7 +397,8 @@
@@ -388,7 +398,8 @@
itemstack.shrink(1);
}

47
paper-server/nms-patches/net/minecraft/world/entity/animal/allay/Allay.patch
View File

@@ -1,15 +1,6 @@
--- a/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/net/minecraft/world/entity/animal/allay/Allay.java
@@ -93,13 +93,14 @@
private final DynamicGameEventListener<Allay.a> dynamicJukeboxListener;
private final InventorySubcontainer inventory = new InventorySubcontainer(1);
@Nullable
- private BlockPosition jukeboxPos;
- private long duplicationCooldown;
+ public BlockPosition jukeboxPos; // PAIL private -> public
+ public long duplicationCooldown; // PAIL private -> public
private float holdingItemAnimationTicks;
private float holdingItemAnimationTicks0;
@@ -99,6 +99,7 @@
private float dancingAnimationTicks;
private float spinningAnimationTicks;
private float spinningAnimationTicks0;
@@ -17,7 +8,7 @@
public Allay(EntityTypes<? extends Allay> entitytypes, World world) {
super(entitytypes, world);
@@ -111,6 +112,12 @@
@@ -110,6 +111,12 @@
this.dynamicJukeboxListener = new DynamicGameEventListener<>(new Allay.a(this.vibrationUser.getPositionSource(), GameEvent.JUKEBOX_PLAY.getNotificationRadius()));
}
@@ -30,7 +21,7 @@
@Override
protected BehaviorController.b<Allay> brainProvider() {
return BehaviorController.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
@@ -123,7 +130,7 @@
@@ -122,7 +129,7 @@
@Override
public BehaviorController<Allay> getBrain() {
@@ -39,7 +30,7 @@
}
public static AttributeProvider.Builder createAttributes() {
@@ -230,7 +237,7 @@
@@ -229,7 +236,7 @@
public void aiStep() {
super.aiStep();
if (!this.level().isClientSide && this.isAlive() && this.tickCount % 10 == 0) {
@@ -48,7 +39,7 @@
}
if (this.isDancing() && this.shouldStopDancing() && this.tickCount % 20 == 0) {
@@ -300,7 +307,12 @@
@@ -299,7 +306,12 @@
ItemStack itemstack1 = this.getItemInHand(EnumHand.MAIN_HAND);
if (this.isDancing() && this.isDuplicationItem(itemstack) && this.canDuplicate()) {
@@ -62,7 +53,7 @@
this.level().broadcastEntityEvent(this, (byte) 18);
this.level().playSound(entityhuman, (Entity) this, SoundEffects.AMETHYST_BLOCK_CHIME, SoundCategory.NEUTRAL, 2.0F, 1.0F);
this.removeInteractionItem(entityhuman, itemstack);
@@ -311,7 +323,7 @@
@@ -310,7 +322,7 @@
this.setItemInHand(EnumHand.MAIN_HAND, itemstack2);
this.removeInteractionItem(entityhuman, itemstack);
this.level().playSound(entityhuman, (Entity) this, SoundEffects.ALLAY_ITEM_GIVEN, SoundCategory.NEUTRAL, 2.0F, 1.0F);
@@ -71,7 +62,7 @@
return EnumInteractionResult.SUCCESS;
} else if (!itemstack1.isEmpty() && enumhand == EnumHand.MAIN_HAND && itemstack.isEmpty()) {
this.setItemSlot(EnumItemSlot.MAINHAND, ItemStack.EMPTY);
@@ -432,6 +444,7 @@
@@ -427,6 +439,7 @@
}
private boolean shouldStopDancing() {
@@ -79,7 +70,7 @@
return this.jukeboxPos == null || !this.jukeboxPos.closerToCenterThan(this.position(), (double) GameEvent.JUKEBOX_PLAY.getNotificationRadius()) || !this.level().getBlockState(this.jukeboxPos).is(Blocks.JUKEBOX);
}
@@ -476,7 +489,7 @@
@@ -471,7 +484,7 @@
public void addAdditionalSaveData(NBTTagCompound nbttagcompound) {
super.addAdditionalSaveData(nbttagcompound);
this.writeInventoryToTag(nbttagcompound);
@@ -88,7 +79,7 @@
Logger logger = Allay.LOGGER;
Objects.requireNonNull(logger);
@@ -492,7 +505,7 @@
@@ -487,7 +500,7 @@
super.readAdditionalSaveData(nbttagcompound);
this.readInventoryFromTag(nbttagcompound);
if (nbttagcompound.contains("listener", 10)) {
@@ -97,16 +88,16 @@
Logger logger = Allay.LOGGER;
Objects.requireNonNull(logger);
@@ -525,7 +538,7 @@
@@ -520,7 +533,7 @@
return Allay.DUPLICATION_ITEM.test(itemstack);
}
- private void duplicateAllay() {
+ public Allay duplicateAllay() { // CraftBukkit - return allay and private -> public
- public void duplicateAllay() {
+ public Allay duplicateAllay() { // CraftBukkit - return allay
Allay allay = (Allay) EntityTypes.ALLAY.create(this.level());
if (allay != null) {
@@ -533,17 +546,17 @@
@@ -528,9 +541,9 @@
allay.setPersistenceRequired();
allay.resetDuplicationCooldown();
this.resetDuplicationCooldown();
@@ -117,14 +108,4 @@
+ return allay; // CraftBukkit
}
- private void resetDuplicationCooldown() {
+ public void resetDuplicationCooldown() { // PAIL private -> public
this.duplicationCooldown = 6000L;
this.entityData.set(Allay.DATA_CAN_DUPLICATE, false);
}
- private boolean canDuplicate() {
+ public boolean canDuplicate() { // PAIL private -> public
return (Boolean) this.entityData.get(Allay.DATA_CAN_DUPLICATE);
}
public void resetDuplicationCooldown() {

4
paper-server/nms-patches/net/minecraft/world/entity/animal/axolotl/Axolotl.patch
View File

@@ -27,7 +27,7 @@
}
@Override
@@ -419,7 +426,7 @@
@@ -414,7 +421,7 @@
int i = mobeffect != null ? mobeffect.getDuration() : 0;
int j = Math.min(2400, 100 + i);
@@ -36,7 +36,7 @@
}
entityhuman.removeEffect(MobEffects.DIG_SLOWDOWN);
@@ -469,7 +476,7 @@
@@ -464,7 +471,7 @@
@Override
public BehaviorController<Axolotl> getBrain() {

8
paper-server/nms-patches/net/minecraft/world/entity/animal/goat/Goat.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/net/minecraft/world/entity/animal/goat/Goat.java
@@ -54,6 +54,12 @@
import net.minecraft.world.level.pathfinder.PathType;
@@ -55,6 +55,12 @@
import net.minecraft.world.phys.Vec3D;
import org.joml.Vector3f;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -13,7 +13,7 @@
public class Goat extends EntityAnimal {
public static final EntitySize LONG_JUMPING_DIMENSIONS = EntitySize.scalable(0.9F, 1.3F).scale(0.7F);
@@ -181,7 +187,7 @@
@@ -182,7 +188,7 @@
@Override
public BehaviorController<Goat> getBrain() {
@@ -22,7 +22,7 @@
}
@Override
@@ -219,8 +225,15 @@
@@ -220,8 +226,15 @@
ItemStack itemstack = entityhuman.getItemInHand(enumhand);
if (itemstack.is(Items.BUCKET) && !this.isBaby()) {

20
paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.java
+++ b/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.java
@@ -78,6 +78,12 @@
import net.minecraft.world.phys.Vec2F;
@@ -79,6 +79,12 @@
import net.minecraft.world.phys.Vec3D;
import org.joml.Vector3f;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -13,7 +13,7 @@
public abstract class EntityHorseAbstract extends EntityAnimal implements IInventoryListener, HasCustomInventoryScreen, OwnableEntity, IJumpable, ISaddleable {
public static final int EQUIPMENT_SLOT_OFFSET = 400;
@@ -139,6 +145,7 @@
@@ -140,6 +146,7 @@
protected int gallopSoundCounter;
@Nullable
private UUID owner;
@@ -21,7 +21,7 @@
protected EntityHorseAbstract(EntityTypes<? extends EntityHorseAbstract> entitytypes, World world) {
super(entitytypes, world);
@@ -334,7 +341,7 @@
@@ -335,7 +342,7 @@
public void createInventory() {
InventorySubcontainer inventorysubcontainer = this.inventory;
@@ -30,7 +30,7 @@
if (inventorysubcontainer != null) {
inventorysubcontainer.removeListener(this);
int i = Math.min(inventorysubcontainer.getContainerSize(), this.inventory.getContainerSize());
@@ -442,7 +449,7 @@
@@ -443,7 +450,7 @@
}
public int getMaxTemper() {
@@ -39,7 +39,7 @@
}
@Override
@@ -513,7 +520,7 @@
@@ -514,7 +521,7 @@
}
if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
@@ -48,7 +48,7 @@
flag = true;
}
@@ -590,7 +597,7 @@
@@ -591,7 +598,7 @@
super.aiStep();
if (!this.level().isClientSide && this.isAlive()) {
if (this.random.nextInt(900) == 0 && this.deathTime == 0) {
@@ -57,7 +57,7 @@
}
if (this.canEatGrass()) {
@@ -857,6 +864,7 @@
@@ -858,6 +865,7 @@
if (this.getOwnerUUID() != null) {
nbttagcompound.putUUID("Owner", this.getOwnerUUID());
}
@@ -65,7 +65,7 @@
if (!this.inventory.getItem(0).isEmpty()) {
nbttagcompound.put("SaddleItem", this.inventory.getItem(0).save(new NBTTagCompound()));
@@ -884,6 +892,11 @@
@@ -885,6 +893,11 @@
if (uuid != null) {
this.setOwnerUUID(uuid);
}
@@ -77,7 +77,7 @@
if (nbttagcompound.contains("SaddleItem", 10)) {
ItemStack itemstack = ItemStack.of(nbttagcompound.getCompound("SaddleItem"));
@@ -986,6 +999,17 @@
@@ -987,6 +1000,17 @@
@Override
public void handleStartJump(int i) {

2
paper-server/nms-patches/net/minecraft/world/entity/animal/horse/EntityLlama.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/horse/EntityLlama.java
+++ b/net/minecraft/world/entity/animal/horse/EntityLlama.java
@@ -82,6 +82,11 @@
@@ -84,6 +84,11 @@
return false;
}

8
paper-server/nms-patches/net/minecraft/world/entity/animal/sniffer/Sniffer.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -82,14 +82,23 @@
@@ -83,14 +83,23 @@
public Sniffer(EntityTypes<? extends EntityAnimal> entitytypes, World world) {
super(entitytypes, world);
@@ -26,7 +26,7 @@
@Override
protected float getStandingEyeHeight(EntityPose entitypose, EntitySize entitysize) {
return this.getDimensions(entitypose).height * 0.6F;
@@ -270,6 +279,13 @@
@@ -267,6 +276,13 @@
ItemStack itemstack = (ItemStack) iterator.next();
EntityItem entityitem = new EntityItem(worldserver, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), itemstack);
@@ -40,7 +40,7 @@
entityitem.setDefaultPickUpDelay();
worldserver.addFreshEntity(entityitem);
}
@@ -309,7 +325,7 @@
@@ -306,7 +322,7 @@
List<GlobalPos> list = (List) this.getExploredPositions().limit(20L).collect(Collectors.toList());
list.add(0, GlobalPos.of(this.level().dimension(), blockposition));
@@ -49,7 +49,7 @@
return this;
}
@@ -461,7 +477,7 @@
@@ -458,7 +474,7 @@
@Override
public BehaviorController<Sniffer> getBrain() {