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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
19ff55ef Update upstream B/CB
79710332 Update upstream CB
19de9af6 1.15.2 update (#2887)
d4ae43fc Updated Upstream (Bukkit/CraftBukkit)
9c2d9a5f [CI-SKIP] Rebuild patches
86a4b752 Fix items not falling correctly (Resolves #2835) (#2872)
35472de2 Port activation range improvement patch (#2763)
617f6033 Add effect to block break naturally (#2819)
f63cfe00 Updated Upstream (Bukkit/CraftBukkit)
00860e4e [CI-SKIP] rebuild patches
3d519668 Prevent sync chunk loads when villagers try to find beds (#2855)
This commit is contained in:
William Blake Galbreath
2020-01-21 22:17:22 -06:00
parent ab2c6c147e
commit 8ad9357437
38 changed files with 466 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
patches/server/0010-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From be3d390a49f53f39c350fa8be8185ac808f25683 Mon Sep 17 00:00:00 2001
From c379803cc6ac0a39a2722e78a47fb7d55011a50b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -116,7 +116,7 @@ index 1d9ba04da..2bade947e 100644
this.d = false;
this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index cd3ea3359..ad9e98358 100644
index 863ff08fd..bdee6efe6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -79,6 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -148,7 +148,7 @@ index cd3ea3359..ad9e98358 100644
public boolean noclip;
public float J;
protected final Random random;
@@ -2107,7 +2110,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2108,7 +2111,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
@@ -163,7 +163,7 @@ index cd3ea3359..ad9e98358 100644
}
return true; // CraftBukkit
}
@@ -2142,6 +2151,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2143,6 +2152,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -176,7 +176,7 @@ index cd3ea3359..ad9e98358 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -3369,4 +3384,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3370,4 +3385,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}
@@ -257,7 +257,7 @@ index 34239160b..b19028fa8 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
index 829aab7f7..0071e1869 100644
index f67d66b9a..24b22741d 100644
--- a/src/main/java/net/minecraft/server/EntityBee.java
+++ b/src/main/java/net/minecraft/server/EntityBee.java
@@ -1,6 +1,7 @@
@@ -592,7 +592,7 @@ index e1d0f0f38..dcff77d8d 100644
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
if (net.pl3x.purpur.PurpurConfig.feedMushroomsToCows > 0) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT, Blocks.RED_MUSHROOM.getItem(), Blocks.BROWN_MUSHROOM.getItem()), false)); else // Purpur
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 77ba92333..72efa596d 100644
index 45dfc8104..d1acd38f9 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -21,12 +21,14 @@ public class EntityCreeper extends EntityMonster {
@@ -931,7 +931,7 @@ index d332907b3..0ca3d45c9 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index bd62ac3ed..738e6cb8f 100644
index 82a32d5db..00055c39e 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -48,6 +48,7 @@ public class EntityFox extends EntityAnimal {
@@ -1264,7 +1264,7 @@ index 5782a25ec..dbe022340 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 003df00b4..57c528d53 100644
index 2edb99b63..d5e8831f1 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1311,7 +1311,7 @@ index 81b7cd06f..18fedbc69 100644
this.goalSelector.a(4, new EntityIllagerIllusioner.b());
this.goalSelector.a(5, new EntityIllagerIllusioner.a());
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 5fb3c948d..654229c28 100644
index e0355d3a3..9aafac6db 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -10,6 +10,7 @@ import java.util.UUID;
@@ -1352,7 +1352,7 @@ index 5fb3c948d..654229c28 100644
this.bq = new ControllerJump(this);
this.c = this.o();
this.navigation = this.b(world);
@@ -152,6 +156,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -163,6 +167,7 @@ public abstract class EntityInsentient extends EntityLiving {
}
public boolean setGoalTarget(EntityLiving entityliving, EntityTargetEvent.TargetReason reason, boolean fireEvent) {
@@ -1360,7 +1360,7 @@ index 5fb3c948d..654229c28 100644
if (getGoalTarget() == entityliving) return false;
if (fireEvent) {
if (reason == EntityTargetEvent.TargetReason.UNKNOWN && getGoalTarget() != null && entityliving == null) {
@@ -483,6 +488,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -494,6 +499,7 @@ public abstract class EntityInsentient extends EntityLiving {
return super.cW();
}
@@ -1368,7 +1368,7 @@ index 5fb3c948d..654229c28 100644
public void r(float f) {
this.bb = f;
}
@@ -495,6 +501,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -506,6 +512,7 @@ public abstract class EntityInsentient extends EntityLiving {
this.aZ = f;
}
@@ -1376,7 +1376,7 @@ index 5fb3c948d..654229c28 100644
@Override
public void o(float f) {
super.o(f);
@@ -1064,7 +1071,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1075,7 +1082,7 @@ public abstract class EntityInsentient extends EntityLiving {
}
protected boolean a(EntityHuman entityhuman, EnumHand enumhand) {
@@ -1385,7 +1385,7 @@ index 5fb3c948d..654229c28 100644
}
public boolean ec() {
@@ -1363,4 +1370,43 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1374,4 +1381,43 @@ public abstract class EntityInsentient extends EntityLiving {
public boolean a(Item item) {
return this.getItemInMainHand().getItem() == item || this.getItemInOffHand().getItem() == item;
}
@@ -1464,7 +1464,7 @@ index 2f764776b..63b88f454 100644
float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0d5236bd7..969a77c59 100644
index d44977891..b28c0de9a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -91,10 +91,10 @@ public abstract class EntityLiving extends Entity {
@@ -1503,7 +1503,7 @@ index 0d5236bd7..969a77c59 100644
}
protected void cD() {
@@ -2088,7 +2096,7 @@ public abstract class EntityLiving extends Entity {
@@ -2090,7 +2098,7 @@ public abstract class EntityLiving extends Entity {
return 0.42F * this.ah();
}
@@ -1512,7 +1512,7 @@ index 0d5236bd7..969a77c59 100644
float f = this.dp();
if (this.hasEffect(MobEffects.JUMP)) {
@@ -2097,6 +2105,7 @@ public abstract class EntityLiving extends Entity {
@@ -2099,6 +2107,7 @@ public abstract class EntityLiving extends Entity {
Vec3D vec3d = this.getMot();
@@ -1520,7 +1520,7 @@ index 0d5236bd7..969a77c59 100644
this.setMot(vec3d.x, (double) f, vec3d.z);
if (this.isSprinting()) {
float f1 = this.yaw * 0.017453292F;
@@ -2315,10 +2324,12 @@ public abstract class EntityLiving extends Entity {
@@ -2317,10 +2326,12 @@ public abstract class EntityLiving extends Entity {
return this.onGround ? this.dt() * (0.21600002F / (f * f * f)) : this.aM;
}
@@ -1534,7 +1534,7 @@ index 0d5236bd7..969a77c59 100644
this.bB = f;
}
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index 6d4d41c88..6ebb6fd66 100644
index 193dbfc5f..ec0f57d90 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -16,6 +16,29 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -1655,7 +1655,7 @@ index 1fdc248ba..b5e8857cb 100644
this.setMot(vec3d.x, (double) (this.dp() + (float) this.getSize() * 0.1F), vec3d.z);
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
index ce5bac35d..80c98c04b 100644
index a9688fbfc..5c339fb56 100644
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -18,6 +18,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -2357,7 +2357,7 @@ index 6be29f307..7347ffcd5 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
index e3419a7f4..a065ddb90 100644
index a8ef98981..f7d9dee92 100644
--- a/src/main/java/net/minecraft/server/EntitySheep.java
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -18,7 +18,7 @@ import org.bukkit.inventory.InventoryView;
@@ -2447,7 +2447,7 @@ index 0e78d5c62..908e51b63 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
index fdeb8980d..347766e4b 100644
index 3c95c0428..a8cd1dcb9 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
@@ -28,6 +28,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -2510,7 +2510,7 @@ index 2efc18df9..71e8e95d2 100644
this.setMot(vec3d.x, (double) this.dp(), vec3d.z);
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 53c5057d2..9d9998820 100644
index 54404dd4b..eabf5a15a 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -13,10 +13,12 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -2807,7 +2807,7 @@ index dd02cb348..f18261197 100644
if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().m()) {
double d0 = this.b - this.i.locX();
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index dcba6d6c8..b82d53e5d 100644
index 2157f0899..0dd9897b9 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -267,6 +267,10 @@ public class EntityTypes<T extends Entity> {
@@ -2966,7 +2966,7 @@ index db15d5e0a..738a9e1db 100644
private final EntityWolf j;
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 7d882d9c7..8f9d252c1 100644
index 8635d4f40..6139281e5 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -37,6 +37,7 @@ public class EntityZombie extends EntityMonster {