Archiviert
13
0

[CI-SKIP] [Auto] Rebuild Patches

A recent commit has been made that caused patches to be out of order, rebuilding
Dieser Commit ist enthalten in:
Aikar 2018-09-07 20:06:35 -04:00
Ursprung 0e749a05b2
Commit 2571276390
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 401ADFC9891FAAFE

Datei anzeigen

@ -1,4 +1,4 @@
From cf0b7a7bedd11fa9cb57217baf8486647bbe65a2 Mon Sep 17 00:00:00 2001 From 82c64be280dc34840de9c10a2f4260cad8e8e690 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 4 Sep 2018 19:07:57 -0400 Date: Tue, 4 Sep 2018 19:07:57 -0400
Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble
@ -23,7 +23,7 @@ This reasoning leads us to one clear conclusion: The simplest, least invasive, a
store the AABB in NBT data on chunk save and restore the AABB exactly as it was saved upon reload. store the AABB in NBT data on chunk save and restore the AABB exactly as it was saved upon reload.
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
index 92edfe029..624f0e395 100644 index 92edfe0295..624f0e3956 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -3,12 +3,12 @@ package net.minecraft.server; @@ -3,12 +3,12 @@ package net.minecraft.server;
@ -46,7 +46,7 @@ index 92edfe029..624f0e395 100644
public AxisAlignedBB(double d0, double d1, double d2, double d3, double d4, double d5) { public AxisAlignedBB(double d0, double d1, double d2, double d3, double d4, double d5) {
this.a = Math.min(d0, d3); this.a = Math.min(d0, d3);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2b1affd03..1fae9aa07 100644 index 2b1affd03c..1fae9aa074 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1658,6 +1658,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1658,6 +1658,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke