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

Updated Upstream (Paper & Airplane)

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

Paper Changes:
47d48790d Change return type of ItemStack#editMeta to allow checking for successful vs non-successful edits
7aabe7d56 [CI-SKIP] fix minecart vs minecraft typos (#5713)
f775e87b4 [CI-SKIP] ci: update setup-java action (#5710)
c58b3b277 ci: replace Java 11 with Java 16 in GH Actions build flow (#5709)
4b72327a6 ItemStack#editMeta
68984b664 Add Unix domain socket support (#5611)
68c67e680 Add Mob#lookAt API (#5633)
4bacecd16 [Auto] Updated Upstream (Bukkit/CraftBukkit)
1f28e6eeb Fix default ChatRenderer when no plugins are installed (#5702)
ecb0d32ca Enhance (Async)ChatEvent with per-viewer rendering API (#5684)

Airplane Changes:
636dbff0f [ci skip] Cleanup mcdev import files
c57932048 [ci skip] Remove icons
7ada9a476 [skip ci] Need to specify 1.16.5 in the README of course
813df1a44 Update README
daf3f0b29 Optimize air case for raytracing
This commit is contained in:
BillyGalbreath
2021-05-23 23:22:01 -05:00
parent 1343a05085
commit f9ccf6ddbc
22 changed files with 51 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0002-Airplane-Server-Changes.patch
View File

@@ -1784,7 +1784,7 @@ index 72d1c1202581abc284848000663ada5514cfcb15..06d0592bebaefc16c1995781a9e8a355
}
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index fa7a78549a9bb92b93c305dc16f43a9ace7f6f43..858bd62d2a17c15ee573c5cd607a876d3a99c2b1 100644
index 392a707d7d71f2009134741529fb9539bd025619..60aad444eec3af7364b84ec3f696d3b78586cd6a 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -216,6 +216,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -2329,7 +2329,7 @@ index feab0ae1930b5271fe0d06a40c180317dcbc9d1d..99c93d48726b4b92a341ba98721173df
// Paper end - optimise entity tracking
diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
index aae13c2e6c2a30b69c33417932c6a4d0aefeb7f5..dc78bafeddf6b584181c818b90efa7ff531377a3 100644
index bd66ee1b93fc776f77218b87717e0915668e7c04..91eecf296905b85d7cc602dbc3a7b14479ec686a 100644
--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
+++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
@@ -201,10 +201,10 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -3008,7 +3008,7 @@ index 3783f3a83e3e70d77cf0fa1021f62a89c5950af5..d0c63be6ebfa2f95fb3d63eed2e11b1c
private final String a;
private final GameRules.GameRuleCategory b;
diff --git a/src/main/java/net/minecraft/world/level/IBlockAccess.java b/src/main/java/net/minecraft/world/level/IBlockAccess.java
index e612e1d30f76e217b1aa23488ab025adce048f57..c9198d242b9053fad6fa5b53c1894679002d50a7 100644
index e612e1d30f76e217b1aa23488ab025adce048f57..6109d59c02d0c7877e213213c6aec6f8513ccc47 100644
--- a/src/main/java/net/minecraft/world/level/IBlockAccess.java
+++ b/src/main/java/net/minecraft/world/level/IBlockAccess.java
@@ -14,9 +14,11 @@ import net.minecraft.world.level.block.state.IBlockData;
@@ -3023,12 +3023,13 @@ index e612e1d30f76e217b1aa23488ab025adce048f57..c9198d242b9053fad6fa5b53c1894679
public interface IBlockAccess {
@@ -56,6 +58,15 @@ public interface IBlockAccess {
@@ -56,6 +58,16 @@ public interface IBlockAccess {
return BlockPosition.a(axisalignedbb).map(this::getType);
}
+ // Airplane start - broken down variant of below rayTraceBlock, used by World#rayTraceDirect
+ default MovingObjectPosition.EnumMovingObjectType rayTraceBlockDirect(Vec3D vec3d, Vec3D vec3d1, BlockPosition blockposition, IBlockData iblockdata, VoxelShapeCollision voxelshapecoll) {
+ if (iblockdata.isAir()) return null; // Tuinity - optimise air cases
+ VoxelShape voxelshape = RayTrace.BlockCollisionOption.COLLIDER.get(iblockdata, this, blockposition, voxelshapecoll);
+ MovingObjectPositionBlock movingobjectpositionblock = this.rayTrace(vec3d, vec3d1, blockposition, voxelshape, iblockdata);
+