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

Update to Minecraft 1.17.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-07-07 00:00:00 +10:00
parent 0392f45e9c
commit e8c9836ec9
59 changed files with 428 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
public interface Bucketable {
boolean isFromBucket();
@@ -90,10 +98,22 @@
@@ -92,10 +100,22 @@
ItemStack itemstack = entityhuman.b(enumhand);
if (itemstack.getItem() == Items.WATER_BUCKET && t0.isAlive()) {

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

@@ -35,7 +35,7 @@
+ if (flag && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(EntityBee.this, blockposition, iblockdata.set(blockstateinteger, (Integer) iblockdata.get(blockstateinteger) + 1)).isCancelled()) { // Spigot
EntityBee.this.level.triggerEffect(2005, blockposition, 0);
EntityBee.this.level.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(blockstateinteger, (Integer) iblockdata.get(blockstateinteger) + 1));
EntityBee.this.fR();
EntityBee.this.fS();
@@ -1289,7 +1293,7 @@
@Override
protected void a(EntityInsentient entityinsentient, EntityLiving entityliving) {

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

@@ -11,7 +11,7 @@
hashmap.put(2, new MinecraftKey("textures/entity/cat/red.png"));
@@ -433,7 +433,7 @@
}
} else if (this.n(itemstack)) {
} else if (this.isBreedItem(itemstack)) {
this.a(entityhuman, enumhand, itemstack);
- if (this.random.nextInt(3) == 0) {
+ if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) { // CraftBukkit

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

@@ -8,7 +8,7 @@
+ this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityGuardian.class})).a(new Class[0])); // CraftBukkit - decompile error
}
public static AttributeProvider.Builder fv() {
public static AttributeProvider.Builder fw() {
@@ -243,6 +243,12 @@
ItemStack itemstack = entityitem.getItemStack();

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

@@ -1,19 +1,5 @@
--- a/net/minecraft/world/entity/animal/EntityOcelot.java
+++ b/net/minecraft/world/entity/animal/EntityOcelot.java
@@ -68,11 +68,11 @@
this.t();
}
- boolean isTrusting() {
+ public boolean isTrusting() {
return (Boolean) this.entityData.get(EntityOcelot.DATA_TRUSTING);
}
- private void setTrusting(boolean flag) {
+ public void setTrusting(boolean flag) {
this.entityData.set(EntityOcelot.DATA_TRUSTING, flag);
this.t();
}
@@ -133,7 +133,7 @@
@Override
@@ -24,7 +10,7 @@
public static AttributeProvider.Builder p() {
@@ -182,7 +182,8 @@
if ((this.temptGoal == null || this.temptGoal.h()) && !this.isTrusting() && this.n(itemstack) && entityhuman.f((Entity) this) < 9.0D) {
if ((this.temptGoal == null || this.temptGoal.h()) && !this.isTrusting() && this.isBreedItem(itemstack) && entityhuman.f((Entity) this) < 9.0D) {
this.a(entityhuman, enumhand, itemstack);
if (!this.level.isClientSide) {
- if (this.random.nextInt(3) == 0) {

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

@@ -10,7 +10,7 @@
private static final DataWatcherObject<Integer> DATA_VARIANT = DataWatcher.a(Axolotl.class, DataWatcherRegistry.INT);
private static final DataWatcherObject<Boolean> DATA_PLAYING_DEAD = DataWatcher.a(Axolotl.class, DataWatcherRegistry.BOOLEAN);
private static final DataWatcherObject<Boolean> FROM_BUCKET = DataWatcher.a(Axolotl.class, DataWatcherRegistry.BOOLEAN);
@@ -239,6 +240,7 @@
@@ -235,6 +236,7 @@
@Override
public void setFromBucket(boolean flag) {
this.entityData.set(Axolotl.FROM_BUCKET, flag);
@@ -18,7 +18,7 @@
}
@Nullable
@@ -280,7 +282,7 @@
@@ -276,7 +278,7 @@
@Override
protected void mobTick() {
this.level.getMethodProfiler().enter("axolotlBrain");
@@ -27,7 +27,7 @@
this.level.getMethodProfiler().exit();
this.level.getMethodProfiler().enter("axolotlActivityUpdate");
AxolotlAi.a(this);
@@ -422,7 +424,7 @@
@@ -418,7 +420,7 @@
if (i < 2400) {
i = Math.min(2400, 100 + i);
@@ -36,7 +36,7 @@
}
entityhuman.removeEffect(MobEffects.DIG_SLOWDOWN);
@@ -472,7 +474,7 @@
@@ -468,7 +470,7 @@
@Override
public BehaviorController<Axolotl> getBehaviorController() {
@@ -45,7 +45,7 @@
}
@Override
@@ -505,7 +507,7 @@
@@ -501,7 +503,7 @@
@Override
public boolean isTypeNotPersistent(double d0) {

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

@@ -12,7 +12,7 @@
public class Goat extends EntityAnimal {
public static final EntitySize LONG_JUMPING_DIMENSIONS = EntitySize.b(0.9F, 1.3F).a(0.7F);
@@ -123,13 +128,13 @@
@@ -137,13 +142,13 @@
@Override
public BehaviorController<Goat> getBehaviorController() {
@@ -28,7 +28,7 @@
this.level.getMethodProfiler().exit();
this.level.getMethodProfiler().enter("goatActivityUpdate");
GoatAi.b(this);
@@ -161,8 +166,15 @@
@@ -175,8 +180,15 @@
ItemStack itemstack = entityhuman.b(enumhand);
if (itemstack.a(Items.BUCKET) && !this.isBaby()) {

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

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.java
+++ b/net/minecraft/world/entity/animal/horse/EntityHorseAbstract.java
@@ -70,6 +70,8 @@
@@ -69,6 +69,8 @@
import net.minecraft.world.phys.AxisAlignedBB;
import net.minecraft.world.phys.Vec3D;
@@ -9,7 +9,7 @@
public abstract class EntityHorseAbstract extends EntityAnimal implements IInventoryListener, IJumpable, ISaddleable {
public static final int EQUIPMENT_SLOT_OFFSET = 400;
@@ -109,6 +111,7 @@
@@ -108,6 +110,7 @@
private float mouthAnimO;
protected boolean canGallop = true;
protected int gallopSoundCounter;
@@ -17,7 +17,7 @@
protected EntityHorseAbstract(EntityTypes<? extends EntityHorseAbstract> entitytypes, World world) {
super(entitytypes, world);
@@ -293,7 +296,7 @@
@@ -292,7 +295,7 @@
public void loadChest() {
InventorySubcontainer inventorysubcontainer = this.inventory;
@@ -26,7 +26,7 @@
if (inventorysubcontainer != null) {
inventorysubcontainer.b((IInventoryListener) this);
int i = Math.min(inventorysubcontainer.getSize(), this.inventory.getSize());
@@ -409,7 +412,7 @@
@@ -408,7 +411,7 @@
}
public int getMaxDomestication() {
@@ -35,7 +35,7 @@
}
@Override
@@ -479,7 +482,7 @@
@@ -478,7 +481,7 @@
}
if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
@@ -44,7 +44,7 @@
flag = true;
}
@@ -556,7 +559,7 @@
@@ -555,7 +558,7 @@
super.movementTick();
if (!this.level.isClientSide && this.isAlive()) {
if (this.random.nextInt(900) == 0 && this.deathTime == 0) {
@@ -52,8 +52,8 @@
+ this.heal(1.0F, RegainReason.REGEN); // CraftBukkit
}
if (this.fU()) {
@@ -794,6 +797,7 @@
if (this.fV()) {
@@ -786,6 +789,7 @@
if (this.getOwnerUUID() != null) {
nbttagcompound.a("Owner", this.getOwnerUUID());
}
@@ -61,7 +61,7 @@
if (!this.inventory.getItem(0).isEmpty()) {
nbttagcompound.set("SaddleItem", this.inventory.getItem(0).save(new NBTTagCompound()));
@@ -821,6 +825,11 @@
@@ -813,6 +817,11 @@
if (uuid != null) {
this.setOwnerUUID(uuid);
}
@@ -73,7 +73,7 @@
if (nbttagcompound.hasKeyOfType("SaddleItem", 10)) {
ItemStack itemstack = ItemStack.a(nbttagcompound.getCompound("SaddleItem"));
@@ -903,6 +912,18 @@
@@ -895,6 +904,18 @@
@Override
public void b(int i) {
@@ -90,5 +90,5 @@
+ }
+ // CraftBukkit end
this.allowStandSliding = true;
this.fD();
this.fW();
this.fE();
this.fX();