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

Updated Upstream (Tuinity)

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

Tuinity Changes:
ed9c0c4 Fix worldborder checks for getCubes
This commit is contained in:
BillyGalbreath
2020-11-22 07:21:18 -06:00
parent 3e0a7585a4
commit 058399c195
10 changed files with 95 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0116-Ridables.patch
View File

@@ -161,7 +161,7 @@ index bd0267ee4..8b36ac2b0 100644
this.B = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b433bf6e6..ec755b0f2 100644
index d76a93dc1..e80099249 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -200,7 +200,7 @@ index b433bf6e6..ec755b0f2 100644
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -1477,6 +1477,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1480,6 +1480,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
}
@@ -208,7 +208,7 @@ index b433bf6e6..ec755b0f2 100644
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2232,6 +2233,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2235,6 +2236,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(entity, false);
}
@@ -216,7 +216,7 @@ index b433bf6e6..ec755b0f2 100644
public boolean a(Entity entity, boolean flag) {
for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
if (entity1.vehicle == this) {
@@ -2327,6 +2329,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2330,6 +2332,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.passengers.add(entity);
}
@@ -230,7 +230,7 @@ index b433bf6e6..ec755b0f2 100644
}
return true; // CraftBukkit
}
@@ -2367,6 +2376,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2370,6 +2379,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -243,7 +243,7 @@ index b433bf6e6..ec755b0f2 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2532,6 +2547,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2535,6 +2550,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -251,7 +251,7 @@ index b433bf6e6..ec755b0f2 100644
public boolean bE() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2754,6 +2770,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2757,6 +2773,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -259,7 +259,7 @@ index b433bf6e6..ec755b0f2 100644
public void n(float f) {}
public boolean bL() {
@@ -3188,6 +3205,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3191,6 +3208,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -278,7 +278,7 @@ index b433bf6e6..ec755b0f2 100644
@Override
public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
@@ -3640,4 +3669,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3643,4 +3672,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
}
// Paper end