mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
325d6c39a4
Upstream has released updates that appear to apply and compile correctly Paper Changes: 871f30038 fixed kick event leave message (#4766) 0aa0a1d97 Updated Upstream (CraftBukkit) d770f71f4 Add PlayerArmSwingEvent (#5353) 23d887b2a Swapped out Vec3#distanceTo call with a Vec3#distanceToSqr call to remove calls to Math.sqrt 5ff90b938 Fix collisions during world generation (#6129) 20ff0b058 [ci skip] Add a test plugin (#6133) 416ec9898 [ci skip] Remove extra newlines at EOF (#6127) 79d7dfbbe Ensure shulker bounding box is updated (#6010) d8ad276b7 [ci skip] More badges and things to README.md (#5338) bb44da842 Fix cancelling EntityPickupItemEvent for villagers (#6091) 351a2c38b Drop no longer needed patch (#6115) 648f6078d Route sign run_command click events through normal chat logic (#6109) dafc06460 Fix MobEffectArgument#getEffect reobf 4aef0354d [ci skip] Use Java toolchain for run tasks (#6108) 144e5f7ac Add option for logging named entity deaths (#6107) b5be382d0 Add methods to `ProtoWorld` for working with `BlockState`s (#5929)
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Thu, 7 Jan 2021 07:51:25 -0600
|
|
Subject: [PATCH] Add MC-4 fix back
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index ad691bd5c17ef7a8ecb394d620e02b28ac08f5a4..b106801e08d5a87eaaf115653cf57f58f45f5869 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -4034,7 +4034,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
|
// Paper end
|
|
// Paper start - fix MC-4
|
|
if (this instanceof ItemEntity) {
|
|
- if (false && com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Tuinity - revert
|
|
+ if (com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Purpur
|
|
// encode/decode from PacketPlayOutEntity
|
|
x = Mth.lfloor(x * 4096.0D) * (1 / 4096.0D);
|
|
y = Mth.lfloor(y * 4096.0D) * (1 / 4096.0D);
|