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

Update to 1.14.2

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-27 18:40:57 -05:00
parent 61d0e22b1f
commit ccdb3affd5
9 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From 937214c5aa60be8a9dbf6ea56dc0ff2cfa196da6 Mon Sep 17 00:00:00 2001
From 4c601788eff5bd34898c7075765b102311e45527 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
@@ -43,7 +43,7 @@ Subject: [PATCH] Integrate ridables
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
index 454627f65..df3d6cf28 100644
index 454627f65e..df3d6cf281 100644
--- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java
+++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
@@ -1,6 +1,6 @@
@@ -64,7 +64,7 @@ index 454627f65..df3d6cf28 100644
this.d = false;
this.a.aM = this.a(this.a.aM, 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 fc203f5fb..036ea4576 100644
index a7db5163e2..d0a13d14d0 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -113,7 +113,7 @@ index fc203f5fb..036ea4576 100644
entity.j = 60;
}
diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
index e87754ef3..553245ebe 100644
index e87754ef33..553245ebe9 100644
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java
@@ -70,7 +70,7 @@ public abstract class EntityAgeable extends EntityCreature {
@@ -126,7 +126,7 @@ index e87754ef3..553245ebe 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
index a374c3051..9af1c2a09 100644
index a374c30519..9af1c2a096 100644
--- a/src/main/java/net/minecraft/server/EntityChicken.java
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -65,7 +65,7 @@ public class EntityChicken extends EntityAnimal {
@@ -139,7 +139,7 @@ index a374c3051..9af1c2a09 100644
this.forceDrops = true; // CraftBukkit
this.a((IMaterial) Items.EGG);
diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
index d1f3f7f43..2558e1e01 100644
index 04060bb3ef..503a845a2d 100644
--- a/src/main/java/net/minecraft/server/EntityDolphin.java
+++ b/src/main/java/net/minecraft/server/EntityDolphin.java
@@ -524,7 +524,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -175,7 +175,7 @@ index d1f3f7f43..2558e1e01 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
index 817769764..f949c75d4 100644
index 7f34cdbc34..004b167732 100644
--- a/src/main/java/net/minecraft/server/EntityDrowned.java
+++ b/src/main/java/net/minecraft/server/EntityDrowned.java
@@ -205,7 +205,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -206,7 +206,7 @@ index 817769764..f949c75d4 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
index 10b0f9653..9425a7998 100644
index 10b0f96531..9425a79980 100644
--- a/src/main/java/net/minecraft/server/EntityEndermite.java
+++ b/src/main/java/net/minecraft/server/EntityEndermite.java
@@ -18,7 +18,7 @@ public class EntityEndermite extends EntityMonster {
@@ -219,7 +219,7 @@ index 10b0f9653..9425a7998 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
index a28fbdf1e..36229a2c4 100644
index a28fbdf1e0..36229a2c4b 100644
--- a/src/main/java/net/minecraft/server/EntityFish.java
+++ b/src/main/java/net/minecraft/server/EntityFish.java
@@ -75,11 +75,7 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -272,7 +272,7 @@ index a28fbdf1e..36229a2c4 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index bcbade19e..19b8312f2 100644
index bcbade19ea..19b8312f26 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -6,6 +6,7 @@ public class EntityGiantZombie extends EntityMonster {
@@ -284,7 +284,7 @@ index bcbade19e..19b8312f2 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
index 335416d96..6599bce9a 100644
index 335416d962..6599bce9a1 100644
--- a/src/main/java/net/minecraft/server/EntityGuardian.java
+++ b/src/main/java/net/minecraft/server/EntityGuardian.java
@@ -22,8 +22,14 @@ public class EntityGuardian extends EntityMonster {
@@ -349,7 +349,7 @@ index 335416d96..6599bce9a 100644
Vec3D vec3d = new Vec3D(this.b - this.i.locX, this.c - this.i.locY, this.d - this.i.locZ);
double d0 = vec3d.f();
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index 401f00561..d689e1173 100644
index f727fb90cc..068d84d1b0 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -201,7 +201,7 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -362,7 +362,7 @@ index 401f00561..d689e1173 100644
} else {
this.g(entityhuman);
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 686bca4f2..3cc908955 100644
index 686bca4f2c..3cc9089553 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -81,7 +81,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -391,7 +391,7 @@ index 686bca4f2..3cc908955 100644
this.eB();
SoundEffect soundeffect = this.getSoundAngry();
diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
index e61d8f07d..17819fc92 100644
index e61d8f07d8..17819fc92c 100644
--- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
@@ -152,8 +152,12 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract {
@@ -419,7 +419,7 @@ index e61d8f07d..17819fc92 100644
} else {
this.g(entityhuman);
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
index b96726456..b60bb4d17 100644
index b967264562..b60bb4d173 100644
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -156,16 +156,16 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -443,7 +443,7 @@ index b96726456..b60bb4d17 100644
return true;
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
index 1160929e1..d94063885 100644
index 1160929e1b..d94063885e 100644
--- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
+++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
@@ -53,16 +53,16 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -467,7 +467,7 @@ index 1160929e1..d94063885 100644
return true;
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 4bea5f1ea..ac13282a1 100644
index 318c2b0dcf..9afc2b77ae 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -347,9 +347,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -494,7 +494,7 @@ index 4bea5f1ea..ac13282a1 100644
this.setSneaking(false);
} else {
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 5cc08ca7c..ca4e9d0dd 100644
index 48ce154848..3f6b2c7ede 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -63,8 +63,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -578,7 +578,7 @@ index 5cc08ca7c..ca4e9d0dd 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7eef55e2c..6e0d8dccc 100644
index 9ba7a16102..d277281715 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -87,10 +87,10 @@ public abstract class EntityLiving extends Entity {
@@ -596,7 +596,7 @@ index 7eef55e2c..6e0d8dccc 100644
public float be;
protected int bf;
protected double bg;
@@ -369,9 +369,18 @@ public abstract class EntityLiving extends Entity {
@@ -373,9 +373,18 @@ public abstract class EntityLiving extends Entity {
return this.isBaby() ? 0.5F : 1.0F;
}
@@ -616,7 +616,7 @@ index 7eef55e2c..6e0d8dccc 100644
}
protected void cn() {
@@ -2027,7 +2036,7 @@ public abstract class EntityLiving extends Entity {
@@ -2033,7 +2042,7 @@ public abstract class EntityLiving extends Entity {
return 0.42F;
}
@@ -625,7 +625,7 @@ index 7eef55e2c..6e0d8dccc 100644
float f;
if (this.hasEffect(MobEffects.JUMP)) {
@@ -2256,10 +2265,12 @@ public abstract class EntityLiving extends Entity {
@@ -2262,10 +2271,12 @@ public abstract class EntityLiving extends Entity {
return this.onGround ? this.da() * (0.21600002F / (f * f * f)) : this.aO;
}
@@ -638,7 +638,7 @@ index 7eef55e2c..6e0d8dccc 100644
public void o(float f) {
this.bD = f;
}
@@ -2735,6 +2746,7 @@ public abstract class EntityLiving extends Entity {
@@ -2741,6 +2752,7 @@ public abstract class EntityLiving extends Entity {
this.aM = f;
}
@@ -647,7 +647,7 @@ index 7eef55e2c..6e0d8dccc 100644
public void l(float f) {
this.aK = f;
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index f8a8da637..cfb80b34c 100644
index f8a8da6372..cfb80b34c4 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -16,6 +16,28 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -708,7 +708,7 @@ index f8a8da637..cfb80b34c 100644
public boolean eI() {
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 6aa116f4b..033d8e05a 100644
index 6aa116f4b8..033d8e05ac 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -22,6 +22,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -785,7 +785,7 @@ index 6aa116f4b..033d8e05a 100644
EntityPhantom.this.yaw += 180.0F;
this.j = 0.1F;
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index 616075569..e51054b23 100644
index 616075569f..e51054b235 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -111,27 +111,22 @@ public class EntityPig extends EntityAnimal {
@@ -831,7 +831,7 @@ index 616075569..e51054b23 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
index f6fa87158..bd0679e74 100644
index f6fa871587..bd0679e74a 100644
--- a/src/main/java/net/minecraft/server/EntityRabbit.java
+++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -59,7 +59,7 @@ public class EntityRabbit extends EntityAnimal {
@@ -844,7 +844,7 @@ index f6fa87158..bd0679e74 100644
double d0 = this.moveController.c();
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
index e28c0673d..f88cd9e94 100644
index e28c0673dd..f88cd9e948 100644
--- a/src/main/java/net/minecraft/server/EntitySlime.java
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -316,7 +316,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -857,7 +857,7 @@ index e28c0673d..f88cd9e94 100644
this.setMot(vec3d.x, 0.41999998688697815D, vec3d.z);
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index fb36306b9..fb6287f50 100644
index fb36306b90..fb6287f507 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -75,6 +75,7 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -869,7 +869,7 @@ index fb36306b9..fb6287f50 100644
for (int l = 0; l < 4; ++l) {
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index 77c0ed42f..a7434fbe1 100644
index 77c0ed42f4..a7434fbe12 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -174,6 +174,7 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -939,7 +939,7 @@ index 77c0ed42f..a7434fbe1 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
index 70bf06b94..2f41d8ade 100644
index 70bf06b943..2f41d8ade3 100644
--- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java
+++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
@@ -127,6 +127,12 @@ public abstract class EntityTameableAnimal extends EntityAnimal {
@@ -956,7 +956,7 @@ index 70bf06b94..2f41d8ade 100644
this.setTamed(true);
this.setOwnerUUID(entityhuman.getUniqueID());
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index fb0c6bce0..4979f77b7 100644
index fb0c6bce03..4979f77b7d 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -262,6 +262,10 @@ public class EntityTypes<T extends Entity> {
@@ -972,7 +972,7 @@ index fb0c6bce0..4979f77b7 100644
}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
new file mode 100644
index 000000000..99e184d36
index 0000000000..99e184d36e
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
@@ -0,0 +1,74 @@
@@ -1052,7 +1052,7 @@ index 000000000..99e184d36
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
new file mode 100644
index 000000000..d64a66274
index 0000000000..d64a66274b
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
@@ -0,0 +1,77 @@
@@ -1135,7 +1135,7 @@ index 000000000..d64a66274
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
new file mode 100644
index 000000000..1a5a0c04c
index 0000000000..1a5a0c04c8
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -0,0 +1,58 @@
@@ -1199,7 +1199,7 @@ index 000000000..1a5a0c04c
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
new file mode 100644
index 000000000..74ff48259
index 0000000000..74ff48259c
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
@@ -0,0 +1,42 @@
@@ -1246,7 +1246,7 @@ index 000000000..74ff48259
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 98f62d776..83eeab5c3 100644
index 98f62d7760..83eeab5c37 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -710,5 +710,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {