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

Updated Upstream (Paper)

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

Paper Changes:
a4f066cc Fix method profiler inbalance introduced in a2a9ffe (#3132)
c65dcad3 Don't delay chunk unloads during entity ticking
bc17ce69 Delay unsafe actions until after entity ticking is done - Fixes #3114
5553e6b3 Disable Sync Events firing Async errors during shutdown
e12c51d9 Use better variable for isStopping() API
586ee2bb Remove patch for MC-111480, fixed in 1.14
09a94215 Remove streams from Mob AI System
bb5c294e Fix Disabling Asynchronous Chunks
089d8356 Implement Chunk Priority / Urgency System for World Gen
fce69af7 Use dedicated thread for main thread blocking chunk loads
588b62e4 Add tick times API and /mspt command (#3102)
11de41c7 Add API MinecraftServer#isStopping (#3129)
942ff3c2 My patches are under MIT (#3130)
This commit is contained in:
William Blake Galbreath
2020-04-12 03:45:54 -05:00
parent bf845ca9e4
commit 193c511fce
95 changed files with 275 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/server/0007-Ridables.patch
View File

@@ -1,4 +1,4 @@
From b1a2d7c1ba4db2363fb795da44c55dcd68e8b682 Mon Sep 17 00:00:00 2001
From e51672ab45d21a513bb38ecb7e4aa3446f074d43 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
@@ -197,7 +197,7 @@ index 816d301f1c..f7344d3aec 100644
this.C = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 862a64b6fd..69ae184bc6 100644
index 9cb4e5a1e6..48be21826c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -79,7 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -236,7 +236,7 @@ index 862a64b6fd..69ae184bc6 100644
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -822,6 +822,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -823,6 +823,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return vec3d1;
}
@@ -244,7 +244,7 @@ index 862a64b6fd..69ae184bc6 100644
public static double b(Vec3D vec3d) {
return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
}
@@ -1148,6 +1149,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1149,6 +1150,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return flag;
}
@@ -252,7 +252,7 @@ index 862a64b6fd..69ae184bc6 100644
private boolean l() {
return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
}
@@ -1161,8 +1163,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1162,8 +1164,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.isInWater() || this.isInRain() || this.l();
}
@@ -263,7 +263,7 @@ index 862a64b6fd..69ae184bc6 100644
}
public boolean aA() {
@@ -1293,6 +1296,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1294,6 +1297,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.inLava;
}
@@ -271,7 +271,7 @@ index 862a64b6fd..69ae184bc6 100644
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2124,7 +2128,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2125,7 +2129,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
@@ -286,7 +286,7 @@ index 862a64b6fd..69ae184bc6 100644
}
return true; // CraftBukkit
}
@@ -2159,6 +2169,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2160,6 +2170,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -299,7 +299,7 @@ index 862a64b6fd..69ae184bc6 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2327,6 +2343,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2328,6 +2344,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -307,7 +307,7 @@ index 862a64b6fd..69ae184bc6 100644
public boolean bt() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2545,6 +2562,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2546,6 +2563,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -315,7 +315,7 @@ index 862a64b6fd..69ae184bc6 100644
public void l(float f) {}
public boolean bA() {
@@ -3391,4 +3409,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3392,4 +3410,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}
@@ -5184,17 +5184,17 @@ index c4aa38ddf1..3d52a396e6 100644
return f1 + f * (f2 - f1);
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
index bdb90a3466..e059930ba7 100644
index 134f7d0013..d659796737 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoal.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
@@ -27,6 +27,7 @@ public abstract class PathfinderGoal {
@@ -28,6 +28,7 @@ public abstract class PathfinderGoal {
public void e() {}
+ public void setTypes(EnumSet<PathfinderGoal.Type> types) { this.a(types); } // Purpur - OBFHELPER
public void a(EnumSet<PathfinderGoal.Type> enumset) {
this.a.clear();
this.a.addAll(enumset);
// Paper start - remove streams from pathfindergoalselector
this.goalTypes.clear();
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
index e07c7674a5..3c077b6870 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java