Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +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:
3b008f5 Optimisations
200f825 Actually unload POI data
db64f14 Make sure to despawn entities if they are outside the player general
89276ac Fix villagers aggressively looking at people
8830cef Remove streams for poi searching in some zombie pathfinding
a17dc2c Attempt to fix incorrect nearest village distance tracker updating
ef8cd34 Fix NPE
3e45700Do not return complex parts for entity by class lookup
2110847 Rewrite getClosestEntity
460581d Fix getClosestEntity not working
2cb36ca Optimise non-flush packet sending
784b838 Some fixes
e2dcdd1 Correct return value for ChunkCache#getCubes
968512b Add Velocity natives for encryption and compression (#188)
102d60b Rebuild patches
57fed71 Fix decompression with Velocity natives
442890b Fix decompression with Velocity natives (#191)
0179ea8 Re-Add region manager and notify patch
cbffdcc Do not mark entities in unloaded chunks as being in blocks
f2eef4a Fixup dev branch patches and store reverted patches in revert folder
This commit is contained in:
William Blake Galbreath
2020-11-05 18:14:09 -06:00
parent cf3e3e723b
commit 67be68c780
31 changed files with 2700 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,7 @@ index bd0267ee4b..8b36ac2b09 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 7635e25422..7c201dd17d 100644
index 41dcd97f9c..22009f8cdf 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 7635e25422..7c201dd17d 100644
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -1460,6 +1460,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1488,6 +1488,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
}
@@ -208,7 +208,7 @@ index 7635e25422..7c201dd17d 100644
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2215,6 +2216,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2243,6 +2244,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(entity, false);
}
@@ -216,7 +216,7 @@ index 7635e25422..7c201dd17d 100644
public boolean a(Entity entity, boolean flag) {
for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
if (entity1.vehicle == this) {
@@ -2310,6 +2312,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2338,6 +2340,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.passengers.add(entity);
}
@@ -230,7 +230,7 @@ index 7635e25422..7c201dd17d 100644
}
return true; // CraftBukkit
}
@@ -2350,6 +2359,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2378,6 +2387,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -243,7 +243,7 @@ index 7635e25422..7c201dd17d 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2515,6 +2530,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2543,6 +2558,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -251,7 +251,7 @@ index 7635e25422..7c201dd17d 100644
public boolean bE() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2737,6 +2753,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2765,6 +2781,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -259,7 +259,7 @@ index 7635e25422..7c201dd17d 100644
public void n(float f) {}
public boolean bL() {
@@ -3171,6 +3188,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3199,6 +3216,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -278,7 +278,7 @@ index 7635e25422..7c201dd17d 100644
@Override
public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
@@ -3623,4 +3652,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3651,4 +3680,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
}
// Paper end
@@ -2199,7 +2199,7 @@ index b6c6b4d54e..f5b6d83f87 100644
this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 11002b5950..99c4606105 100644
index 2fcd7f461a..6952832458 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -29,7 +29,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2255,7 +2255,7 @@ index 11002b5950..99c4606105 100644
public void v(float f) {
this.aR = f;
}
@@ -1242,7 +1245,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1248,7 +1251,7 @@ public abstract class EntityInsentient extends EntityLiving {
protected void a(EntityHuman entityhuman, EntityInsentient entityinsentient) {}
protected EnumInteractionResult b(EntityHuman entityhuman, EnumHand enumhand) {
@@ -2264,7 +2264,7 @@ index 11002b5950..99c4606105 100644
}
public boolean ev() {
@@ -1614,4 +1617,54 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1620,4 +1623,54 @@ public abstract class EntityInsentient extends EntityLiving {
this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
this.unleash(true, false);
}
@@ -2843,7 +2843,7 @@ index f7b92078ea..66c1d666cd 100644
this.goalSelector.a(2, new PathfinderGoalSit(this));
this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true));
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 03c9a8d0c2..e8900e9a5c 100644
index bdfe073dcd..f8c3480045 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -25,6 +25,58 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -4992,10 +4992,10 @@ index 5af554870b..c59305ef7d 100644
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 41ba7beac4..94d1dafec6 100644
index 10a2d2a20c..64824e708a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1520,5 +1520,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1648,5 +1648,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public boolean isTheEnd() {
return getWorld().getEnvironment() == org.bukkit.World.Environment.THE_END;
}