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 Tuinity patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-14 17:05:49 -05:00
parent 69d17aafbb
commit 3afc502214
10 changed files with 176 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0006-Ridables.patch
View File

@@ -1,4 +1,4 @@
From ae0dd156cdf32c8f2221f31c81d8c5afa9389050 Mon Sep 17 00:00:00 2001
From c485c84bef3d7371965e13ba58101a79149016c3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -143,7 +143,7 @@ index a5c4cbb67f..efe6afde9b 100644
public ControllerMove(EntityInsentient entityinsentient) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 23e91183ef..d87bfc98e7 100644
index 181f1742ac..8343be49d1 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -182,7 +182,7 @@ index 23e91183ef..d87bfc98e7 100644
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -1337,6 +1337,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1384,6 +1384,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.inLava;
}
@@ -190,7 +190,7 @@ index 23e91183ef..d87bfc98e7 100644
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2165,7 +2166,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2212,7 +2213,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
@@ -205,7 +205,7 @@ index 23e91183ef..d87bfc98e7 100644
}
return true; // CraftBukkit
}
@@ -2200,6 +2207,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2247,6 +2254,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -218,7 +218,7 @@ index 23e91183ef..d87bfc98e7 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2586,6 +2599,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2633,6 +2646,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -226,7 +226,7 @@ index 23e91183ef..d87bfc98e7 100644
public void l(float f) {}
public boolean bA() {
@@ -3431,4 +3445,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3478,4 +3492,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}
@@ -4760,7 +4760,7 @@ index eec1e26b6e..47f0b2df6c 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 8635d4f40c..e9e2be88e3 100644
index 07ebc1d816..8d1f04415e 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -44,11 +44,30 @@ public class EntityZombie extends EntityMonster {