mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
9115281f SPIGOT-6832: Improve Player#getPing docs

CraftBukkit Changes:
fd3478bc7 #967: Store last lava contact location for events

Spigot Changes:
dbf49382 Rebuild patches
58cb9d26 #113: Use simulationDistance for entity activation range base
This commit is contained in:
Shane Freeder 2021-12-03 21:28:15 +00:00
parent 05a2271884
commit 2f31569807
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
37 changed files with 139 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

20
patches/server/0147-Entity-fromMobSpawner.patch
View file

@ -5,18 +5,18 @@ Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a1ca58317ed0c6a395503d00cff332b092c4d549..6f6a2c6bd371b892dd0e7a9d4c79c462de8b1ffa 100644
index d6e1860772724347d62fb6990304ec8f4cde4035..28d4202f0a9c6910e98d32f6c561ac25c73c186e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -325,6 +325,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
public long activatedTick = Integer.MIN_VALUE;
+ public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
protected int numCollisions = 0; // Paper
public void inactiveTick() { }
@@ -309,6 +309,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
// Spigot end
@@ -1851,6 +1852,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
// Paper start
protected int numCollisions = 0; // Paper
+ public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
@javax.annotation.Nullable
private org.bukkit.util.Vector origin;
@javax.annotation.Nullable
@@ -1856,6 +1857,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
}
nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
}
@ -27,7 +27,7 @@ index a1ca58317ed0c6a395503d00cff332b092c4d549..6f6a2c6bd371b892dd0e7a9d4c79c462
// Paper end
return nbt;
} catch (Throwable throwable) {
@@ -1990,6 +1995,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -1995,6 +2000,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
this.originWorld = originWorld;
origin = new org.bukkit.util.Vector(originTag.getDouble(0), originTag.getDouble(1), originTag.getDouble(2));
}