mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 5d779a621 Implements PlayerHandshakeEvent#getOriginalSocketAddressHostname and deprecates PlayerHandshakeEvent(String, boolean) in favour of PlayerHandshakeEvent(String, String, boolean) 6fab1ee3a Expose Tracked Players b53a650a5 Clear SyncLoadInfo c02c22fde fix: legacy component serialisation was wiped out 2dd5dccf0 Add config option for displayname in quit message (#5260)
This commit is contained in:
@@ -161,18 +161,9 @@ index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37e
|
||||
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 b3b654da3c5a036871248b0a7c8e6ca77b44345d..40432014000b0e6113dc06ab36b64111fa50ad50 100644
|
||||
index efcdd07f92ff64b4ca6faa99a709f88e5bf8a4f9..9ca220f85089609921b1004c1244b0bc4b27b153 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
|
||||
public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
|
||||
private CraftEntity bukkitEntity;
|
||||
|
||||
- PlayerChunkMap.EntityTracker tracker; // Paper
|
||||
+ PlayerChunkMap.EntityTracker tracker; public PlayerChunkMap.EntityTracker getTracker() { return tracker; } // Paper // Purpur
|
||||
boolean collisionLoadChunks = false; // Paper
|
||||
Throwable addedToWorldStack; // Paper - entity debug
|
||||
public CraftEntity getBukkitEntity() {
|
||||
@@ -105,7 +105,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
private int id;
|
||||
public boolean i; public final boolean blocksEntitySpawning() { return this.i; } // Paper - OBFHELPER
|
||||
@@ -5709,7 +5700,7 @@ index 637cac2758a44e72794953b9fbca2accb7d86b6a..d8b5e091047210a8eff45e493f07d30f
|
||||
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0b16a7b6345ff42ea0f42ca79155a50e2fe4926b
|
||||
index 0000000000000000000000000000000000000000..868c1ce1952193cba5ff0ce35e9d607478df7a53
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
|
||||
@@ -0,0 +1,76 @@
|
||||
@@ -5757,7 +5748,7 @@ index 0000000000000000000000000000000000000000..0b16a7b6345ff42ea0f42ca79155a50e
|
||||
+ entity.setHeadRotation(entity.yaw);
|
||||
+ entity.pitch = normalizePitch(pitch + pitchOffset);
|
||||
+
|
||||
+ entity.getTracker().broadcast(new PacketPlayOutEntity
|
||||
+ entity.tracker.broadcast(new PacketPlayOutEntity
|
||||
+ .PacketPlayOutRelEntityMoveLook(entity.getId(),
|
||||
+ (short) 0, (short) 0, (short) 0,
|
||||
+ (byte) MathHelper.d(entity.yaw * 256.0F / 360.0F),
|
||||
|
||||
Reference in New Issue
Block a user