SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

fix: boats' bounding boxes must be deflated, not inflated (#6314)

Quellcode durchsuchen 
Fixes GH-6312.

Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
Dieser Commit ist enthalten in:
Mariell Hoversholm 2021-08-03 12:13:43 +02:00 committet von GitHub
Ursprung aec9781f52
Commit 9a74e70cc0
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
patches/server/0736-Improve-boat-collision-performance.patch
Datei anzeigen

@ -68,7 +68,7 @@ index aa7c022c4faade23bd9061311d4152cf845d3331..99124b70d82140b108d424a5206657ef
this.status = Boat.Status.IN_WATER; this.status = Boat.Status.IN_WATER;
} else { } else {
diff --git a/src/main/java/net/minecraft/world/item/BoatItem.java b/src/main/java/net/minecraft/world/item/BoatItem.java diff --git a/src/main/java/net/minecraft/world/item/BoatItem.java b/src/main/java/net/minecraft/world/item/BoatItem.java
index c0864c833fd313e6ba9339ecc7f9e2359954bda3..87e0faaab1ec98123fd735112d15da332a830554 100644 index c0864c833fd313e6ba9339ecc7f9e2359954bda3..9a11248b13d231c1797e14f843cb8cbec0d35a6e 100644
--- a/src/main/java/net/minecraft/world/item/BoatItem.java --- a/src/main/java/net/minecraft/world/item/BoatItem.java
+++ b/src/main/java/net/minecraft/world/item/BoatItem.java +++ b/src/main/java/net/minecraft/world/item/BoatItem.java
@@ -67,7 +67,7 @@ public class BoatItem extends Item { @@ -67,7 +67,7 @@ public class BoatItem extends Item {
@ -76,7 +76,7 @@ index c0864c833fd313e6ba9339ecc7f9e2359954bda3..87e0faaab1ec98123fd735112d15da33
entityboat.setType(this.type); entityboat.setType(this.type);
entityboat.setYRot(user.getYRot()); entityboat.setYRot(user.getYRot());
- if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(-0.1D))) { - if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(-0.1D))) {
+ if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(net.minecraft.Util.COLLISION_EPSILON))) { + if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(-net.minecraft.Util.COLLISION_EPSILON))) { // Paper
return InteractionResultHolder.fail(itemstack); return InteractionResultHolder.fail(itemstack);
} else { } else {
if (!world.isClientSide) { if (!world.isClientSide) {