mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-26 22:50:23 +02:00
Revert updates to TNT bias patch
This commit is contained in:
parent
3a120c167c
commit
cfd51ccfb9
|
@ -23,32 +23,6 @@ index a442cb1..252ed04 100644
|
||||||
this.fuseTicks = 80;
|
this.fuseTicks = 80;
|
||||||
this.lastX = d0;
|
this.lastX = d0;
|
||||||
this.lastY = d1;
|
this.lastY = d1;
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
||||||
index 3bb1302..9b10da7 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
|
||||||
@@ -1895,6 +1895,12 @@ public abstract class World implements IBlockAccess {
|
|
||||||
double d1 = 1.0D / ((axisalignedbb.e - axisalignedbb.b) * 2.0D + 1.0D);
|
|
||||||
double d2 = 1.0D / ((axisalignedbb.f - axisalignedbb.c) * 2.0D + 1.0D);
|
|
||||||
|
|
||||||
+ // PaperSpigot start - Fix directional TNT bias
|
|
||||||
+ // Shift the sample points so they are centered on the BB, to avoid directional bias
|
|
||||||
+ double xOffset = (1.0 - Math.floor(1.0 / d0) * d0) / 2.0;
|
|
||||||
+ double zOffset = (1.0 - Math.floor(1.0 / d2) * d2) / 2.0;
|
|
||||||
+ // PaperSpigot end
|
|
||||||
+
|
|
||||||
if (d0 >= 0.0D && d1 >= 0.0D && d2 >= 0.0D) {
|
|
||||||
int i = 0;
|
|
||||||
int j = 0;
|
|
||||||
@@ -1907,7 +1913,7 @@ public abstract class World implements IBlockAccess {
|
|
||||||
double d4 = axisalignedbb.b + (axisalignedbb.e - axisalignedbb.b) * (double) f1;
|
|
||||||
double d5 = axisalignedbb.c + (axisalignedbb.f - axisalignedbb.c) * (double) f2;
|
|
||||||
|
|
||||||
- if (this.a(vec3d2.b(d3, d4, d5), vec3d) == null) { // CraftBukkit
|
|
||||||
+ if (this.a(vec3d2.b(xOffset + d3, d4, zOffset + d5), vec3d) == null) { // PaperSpigot - Fix directional TNT bias // CraftBukkit
|
|
||||||
++i;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
--
|
||||||
1.9.1
|
1.9.1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user