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

Updated Upstream (Paper & Tuinity)

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

Paper Changes:
d6f730655 Do not add passengers of entities that were above save limit (#5073)
cb99288a5 Try to get a new 1.16.5 build on website now we hopefully fixed site bug
946cdd2d2 [CI-SKIP] [Auto] Rebuild Patches
8f805412b Remove class 13 from netty preload - Fixes #5066
f6d3c6811 Make ProjectileHitEvent Cancellable
97b020f13 make schedule command per world
aac07a271 Return chat component with empty text instead of throwing exception. Fixes #3328
f27bc0659 Collision option for requiring a player participant
193f80148 Add StructureLocateEvent
59222b5ba Add sendOpLevel API
f792973c2 [CI-SKIP] Update API to 1.16.5 (#5067)

Tuinity Changes:
db82b6c Update to starlight 0.0.3
b97e87f Merge branch 'master' into dev/lighting
1d169e7 Updated Upstream (Paper)
09997a6 Merge branch 'master' into dev/lighting
8954b61 Updated Upstream (Paper)
8753f47 Merge branch 'master' into dev/lighting
4743c34 Updated Upstream (Paper)
This commit is contained in:
jmp
2021-01-16 17:15:41 -08:00
parent ba42138259
commit 7e8bf667fa
33 changed files with 417 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0108-Ridables.patch
View File

@@ -161,7 +161,7 @@ index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37e
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 49020e7d719af5e688a23b35af8c57fdd6934d04..5b4bb8876bd5877aaa2ed6a40c05fb0c2188b444 100644
index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cbb1f8a0b4 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
@@ -208,7 +208,7 @@ index 49020e7d719af5e688a23b35af8c57fdd6934d04..5b4bb8876bd5877aaa2ed6a40c05fb0c
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2246,6 +2247,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2247,6 +2248,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(entity, false);
}
@@ -216,7 +216,7 @@ index 49020e7d719af5e688a23b35af8c57fdd6934d04..5b4bb8876bd5877aaa2ed6a40c05fb0c
public boolean a(Entity entity, boolean flag) {
for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
if (entity1.vehicle == this) {
@@ -2341,6 +2343,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2342,6 +2344,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.passengers.add(entity);
}
@@ -230,7 +230,7 @@ index 49020e7d719af5e688a23b35af8c57fdd6934d04..5b4bb8876bd5877aaa2ed6a40c05fb0c
}
return true; // CraftBukkit
}
@@ -2381,6 +2390,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2382,6 +2391,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -243,7 +243,7 @@ index 49020e7d719af5e688a23b35af8c57fdd6934d04..5b4bb8876bd5877aaa2ed6a40c05fb0c
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2546,6 +2561,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2547,6 +2562,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -251,7 +251,7 @@ index 49020e7d719af5e688a23b35af8c57fdd6934d04..5b4bb8876bd5877aaa2ed6a40c05fb0c
public boolean bE() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2768,6 +2784,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2769,6 +2785,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -259,7 +259,7 @@ index 49020e7d719af5e688a23b35af8c57fdd6934d04..5b4bb8876bd5877aaa2ed6a40c05fb0c
public void n(float f) {}
public boolean bL() {
@@ -3209,6 +3226,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3210,6 +3227,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -278,7 +278,7 @@ index 49020e7d719af5e688a23b35af8c57fdd6934d04..5b4bb8876bd5877aaa2ed6a40c05fb0c
@Override
public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
@@ -3661,4 +3690,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3662,4 +3691,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
}
// Paper end
@@ -4885,7 +4885,7 @@ index cbc0b8bc854ab1b0ba95fa0a2041385f440718d9..89d64ea0d1e61dfce622df026209af12
default int getHeight() {
diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java
index 9f5ce64a60fe7c312399ee416b11b84213dd3bee..b9f8ed355421f24306e0cc2bb976589f4b72b548 100644
index bbc089b41fcbe0141f13591db2cb44b9e688cac4..63040363fa5ae79ab0f2c31a1257cac2a610bc6a 100644
--- a/src/main/java/net/minecraft/server/IProjectile.java
+++ b/src/main/java/net/minecraft/server/IProjectile.java
@@ -12,7 +12,7 @@ public abstract class IProjectile extends Entity {
@@ -6383,7 +6383,7 @@ index a6d849facba1526ae2a2b7f3fb9a140d0b50289c..b56ca054b37f5887e13b481baad8132f
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index c762015e1402b59bf28dae7f947e7737fbac5c1d..956809378997df0aa7c912106799bfdaaed97a53 100644
index 63d329dca12f902e2fb2a62ee4c86aea6453f1a3..a6963544fe460798ee870d7080939c8ec838398e 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -509,6 +509,18 @@ public class CraftEventFactory {