mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
31306b4b0e
Upstream has released updates that appear to apply and compile correctly Paper Changes: b79bc31 Fix MerchantOffer BuyB Only AssertionError (#6206) d6c81c8 Don't apply cramming damage to players (#5903) 12942dc Add rate options and timings for sensors and behaviors (#6027) fc47872 Use mapped names for sensor and behavior timings/config (#6228) c75a837 Don't expose ASM in API (#6229) c225bf9 Fix book title and author being improperly serialized as components (#6190) f25facb Update email & name (DenWav) 44516b1 [ci skip] Put mappings util in a separate class to the stacktrace deobfuscator
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);
|