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 (Paper)

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

Paper Changes:
979b53a7 Do not allow bee's to load chunks for beehives
13cb8373 Remote Connections shouldn't hold up shutdown
7dac5467 Fix bug in double register fix
87829d83 Remove incorrect IO flush for save-all that doesn't have flush parameter
31e751cb Fix unregistering entities from unloading chunks
bc351f6e Ensure Entity is never double registered
2ec0274b Fix many issues with dupe uuid resolve patch
756da10d (Actually) Don't duplicate velocity entry into hidden-configs
9b3679fb Don't duplicate velocity entry into hidden-configs
28cf6540 Pillager patrol spawn settings and per player options (#2924)
6bf04cd5 Reduce entity tracker updates on move
This commit is contained in:
William Blake Galbreath
2020-03-31 19:27:23 -05:00
parent 27fb33e6dc
commit 193b218210
16 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 7265c2942eaf49e272a1fcbd31cf6cce02ecff18 Mon Sep 17 00:00:00 2001
From d7b3299a3aaf3ba71cbae864bab62d1edc2c450e 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
@@ -195,10 +195,10 @@ index 816d301f1..f7344d3ae 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 8da54c68c..6e05cd094 100644
index eb706f863..9c6a1f218 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -79,7 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
private CraftEntity bukkitEntity;
@@ -207,7 +207,7 @@ index 8da54c68c..6e05cd094 100644
Throwable addedToWorldStack; // Paper - entity debug
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null) {
@@ -102,7 +102,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -103,7 +103,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private int id;
public boolean i; public final boolean blocksEntitySpawning() { return this.i; } // Paper - OBFHELPER
public final List<Entity> passengers;
@@ -216,7 +216,7 @@ index 8da54c68c..6e05cd094 100644
@Nullable
private Entity vehicle;
public boolean attachedToPlayer;
@@ -135,7 +135,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public double E;
public double F;
public double G;
@@ -225,7 +225,7 @@ index 8da54c68c..6e05cd094 100644
public boolean noclip;
public float J;
protected final Random random;
@@ -179,7 +179,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -180,7 +180,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private boolean aF;
private final double[] aG;
private long aH;
@@ -234,7 +234,7 @@ index 8da54c68c..6e05cd094 100644
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -815,6 +815,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -816,6 +816,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return vec3d1;
}
@@ -242,7 +242,7 @@ index 8da54c68c..6e05cd094 100644
public static double b(Vec3D vec3d) {
return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
}
@@ -1141,6 +1142,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1142,6 +1143,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return flag;
}
@@ -250,7 +250,7 @@ index 8da54c68c..6e05cd094 100644
private boolean l() {
return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
}
@@ -1154,8 +1156,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1155,8 +1157,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.isInWater() || this.isInRain() || this.l();
}
@@ -261,7 +261,7 @@ index 8da54c68c..6e05cd094 100644
}
public boolean aA() {
@@ -1286,6 +1289,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1287,6 +1290,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.inLava;
}
@@ -269,7 +269,7 @@ index 8da54c68c..6e05cd094 100644
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2113,7 +2117,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2114,7 +2118,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
@@ -284,7 +284,7 @@ index 8da54c68c..6e05cd094 100644
}
return true; // CraftBukkit
}
@@ -2148,6 +2158,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2149,6 +2159,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -297,7 +297,7 @@ index 8da54c68c..6e05cd094 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2316,6 +2332,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2317,6 +2333,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -305,7 +305,7 @@ index 8da54c68c..6e05cd094 100644
public boolean bt() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2534,6 +2551,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2535,6 +2552,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -313,7 +313,7 @@ index 8da54c68c..6e05cd094 100644
public void l(float f) {}
public boolean bA() {
@@ -3379,4 +3397,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3380,4 +3398,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}
@@ -462,7 +462,7 @@ index 34239160b..592408bac 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
index c7d79efdf..7e4aad771 100644
index dd1d246ae..f0f83baac 100644
--- a/src/main/java/net/minecraft/server/EntityBee.java
+++ b/src/main/java/net/minecraft/server/EntityBee.java
@@ -36,9 +36,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -550,7 +550,7 @@ index c7d79efdf..7e4aad771 100644
this.targetSelector.a(1, (new EntityBee.h(this)).a(new Class[0]));
this.targetSelector.a(2, new EntityBee.c(this));
}
@@ -588,6 +630,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -590,6 +632,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
private d() {
super(); // CraftBukkit - decompile error
@@ -558,7 +558,7 @@ index c7d79efdf..7e4aad771 100644
}
@Override
@@ -648,6 +691,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -652,6 +695,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
private g() {
super(); // CraftBukkit - decompile error
@@ -566,7 +566,7 @@ index c7d79efdf..7e4aad771 100644
}
@Override
@@ -712,6 +756,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -716,6 +760,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
private i() {
super(); // CraftBukkit - decompile error
@@ -574,7 +574,7 @@ index c7d79efdf..7e4aad771 100644
}
@Override
@@ -1230,4 +1275,67 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -1234,4 +1279,67 @@ public class EntityBee extends EntityAnimal implements EntityBird {
}
}
@@ -3336,10 +3336,10 @@ index 0357c9da9..98a657cec 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index e7bfbc330..c64cc69f3 100644
index e353d9336..f4fcefc68 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1286,6 +1286,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1291,6 +1291,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void a(float f, float f1, boolean flag, boolean flag1) {
@@ -3347,7 +3347,7 @@ index e7bfbc330..c64cc69f3 100644
if (this.isPassenger()) {
if (f >= -1.0F && f <= 1.0F) {
this.aZ = f;
@@ -1298,7 +1299,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1303,7 +1304,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.jumping = flag;
this.setSneaking(flag1);
}