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

Update to 1.14.1

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-13 21:34:51 -05:00
parent 8340c3972c
commit 6da8a9ec7f
10 changed files with 55 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From bbc58082cd946c920f9856dfc17795e53d1fb651 Mon Sep 17 00:00:00 2001
From e4504b2ee0d50998f0d405860f5d34d6f1d08ec9 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
@@ -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 9834a8928..cfb2192b9 100644
index ab0995c2c..1490f95c4 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -101,6 +101,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -84,7 +84,7 @@ index 9834a8928..cfb2192b9 100644
public boolean noclip;
public float M;
protected final Random random;
@@ -2073,6 +2074,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2067,6 +2068,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// Spigot end
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.getRidingPassenger() instanceof EntityHuman)) {
this.passengers.add(0, entity);
@@ -92,7 +92,7 @@ index 9834a8928..cfb2192b9 100644
} else {
this.passengers.add(entity);
}
@@ -2111,6 +2113,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2105,6 +2107,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -167,7 +167,7 @@ index 56394ccdc..9e5542ade 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 449fbee60..c692ea296 100644
index 817769764..f949c75d4 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 {
@@ -459,7 +459,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 e811a2917..f25c394e3 100644
index 4bea5f1ea..ac13282a1 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 {
@@ -486,7 +486,7 @@ index e811a2917..f25c394e3 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 a0c089477..d7bc766cb 100644
index ba90cdef1..cc3e7dcad 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 {
@@ -570,7 +570,7 @@ index a0c089477..d7bc766cb 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b27a9efcc..8f0c05959 100644
index 0cb8c6cbc..27375059f 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 {
@@ -836,7 +836,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 d720d0fae..e4f7797ed 100644
index e28c0673d..f88cd9e94 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 {
@@ -948,7 +948,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 483c97692..181e92980 100644
index 77d4bbce1..73116e48f 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -255,6 +255,12 @@ public class EntityTypes<T extends Entity> {