Yatopia/patches/server/0036-lithium-VoxelShapesMixin.patch
ishland 0ee1f14d69 Updated Upstream and Sidestream(s) (Tuinity/EMC/Purpur) (FIRST 1.16.4)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
d7f2b6e Updated Upstream (Paper)
0850468 Properly ignite entities that stand in fire
4ff2d15 More cleanup to delay chunk unloads
52f4d08 Cleanup post dev branch merge
f2eef4a Fixup dev branch patches and store reverted patches in revert folder
85aba13 Merge branch 'dev/some-opts'
c3a9e41 Remove deprecated function usage in github actions (#200)
dde7028 Merge branch 'master' into dev/some-opts
083e162 Updated Upstream (Paper) - Update to 1.16.4
576e2cc Rate limit incoming packets
7f251e0 Updated Upstream (Paper)
7d45836 Updated Upstream (Paper)
cff9ec0 Updated Upstream (Paper)
c3d5d24 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
c12d582 Merge branch 'master' into dev/some-opts
cbffdcc Do not mark entities in unloaded chunks as being in blocks
988e550 Updated Upstream (Paper)
84aecdb Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
f7b8e25 Split dev branch
3200930 Merge branch 'master' into dev/some-opts
82e5dfb Updated Upstream (Paper)
d41103d Updated Upstream (Paper)
1d73f6c Updated Upstream (Paper)
8ba1bab Updated Upstream (Paper)
ac6b72e Updated Upstream (Paper)
8d982c4 Updated Upstream (Paper)
2c7bad9 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
903f580 Merge remote-tracking branch 'origin/dev/some-opts' into dev/some-opts
0179ea8 Re-Add region manager and notify patch
6886867 Merge branch 'master' into dev/some-opts
fb292c1 Updated Upstream (Paper)
442890b Fix decompression with Velocity natives (#191)
57fed71 Fix decompression with Velocity natives
102d60b Rebuild patches
968512b Add Velocity natives for encryption and compression (#188)
e2dcdd1 Correct return value for ChunkCache#getCubes
4a99f3e Updated Upstream (Paper)
f5d537e Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
784b838 Some fixes
be0b91f Merge branch 'master' into dev/some-opts
2cb36ca Optimise non-flush packet sending
be68938 Hey git, may I know what happened here?
1cac0a2 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
d72e062 Merge branch 'master' into dev/some-opts
76777f0 Updated Upstream (Paper)
6465aba Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
d82174a Merge branch 'master' into dev/some-opts
460581d Fix getClosestEntity not working
d39cda0 Updated Upstream (Paper)
2110847 Rewrite getClosestEntity
3e45700 Do not return complex parts for entity by class lookup
c9cfdba Updated Upstream (Paper)
5994cb0 Updated Upstream (Paper)
7dfe18c Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
363973d Merge branch 'master' into dev/some-opts
1c05858 Updated Upstream (Paper)
adaafb4 Git merge doesn't update submodules
ab71ded Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
54db338 Merge branch 'master' into dev/some-opts
483289c Updated Upstream (Paper)
e36359e Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.2
ef8cd34 Fix NPE
b770af9 Merge branch 'master' into dev/some-opts
d479e12 Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.2
a1b90f8 Merge branch 'master' into dev/some-opts
30c5ca5 Merge branch 'master' into dev/some-opts
e59b60b Updated Upstream (Paper)
09f62a7 Rebuild patches
b041d11 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.2
27fca2d Merge branch 'master' into dev/some-opts
a218f5d Updated Upstream (Paper)
f7c5428 Updated Upstream (Paper)
a17dc2c Attempt to fix incorrect nearest village distance tracker updating
8830cef Remove streams for poi searching in some zombie pathfinding
89276ac Fix villagers aggressively looking at people
db64f14 Make sure to despawn entities if they are outside the player general area range
ba0bfda Updated Upstream (Paper)
200f825 Actually unload POI data
3dc7b9e Updated Upstream (Paper)
30f6ca0 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
3b008f5 Optimisations
c628aa4 Updated Upstream (Paper)
1ed41fc Updated Upstream (Paper)
193d9bf Updated Upstream (Paper)
f2ac649 Updated Upstream (Paper)
a63298f Upstream
a12e1f6 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
9eed723 Rebuild patches
d03dbcc Updated paper
c1002c5 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
27084eb Updated paper
bfb0ded Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
763aa6c Updated Upstream (Paper)
49898d0 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
199edf5 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
78bfcfb Update everything
bbbe82e change upstream

EMC Changes:
4da58340 clear more entity tasks with reloads
2f3d567f Improve temp meta reloading
efd7ea89 Updated Paper
25426b02 Updated Paper
35099319 Fix blockbreaknaturally event not always having the loc stored

Purpur Changes:
306e9ac Add missing repos for deps
67be68c Updated Upstream (Tuinity)
cf3e3e7 Fix last patch :3
a43bb36 Arrows should not reset despawn counter
f0b8bd7 Updated Upstream (Paper)
f15d3f0 Updated Upstream (Tuinity)
39ce110 Fix missed obf method rename in Tuinity patches
bae5baa Updated Upstream (Paper)
5569d02 Updated Upstream (Paper)
72c4c5e Updated Upstream (Paper)
7fa8baf Update readme
03654a6 Update to 1.16.4 ^_^
0fa478d Updated Upstream (Paper & Tuinity)
3fec5da Rebuild patches
2f7a0a0 Fix client lag on advancement loading
3f325b8 Fix #86 Move pathfinders into NMS package to satisfy Paper's AI API
7cfd3d7 Updated Upstream (Paper)
cc6c167 Updated Upstream (Paper)
2020-11-07 15:03:31 +08:00

61 lines
3.6 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JellySquid <jellysquid+atwork@protonmail.com>
Date: Thu, 20 Aug 2020 16:37:20 +0300
Subject: [PATCH] lithium VoxelShapesMixin
Original code by JellySquid, licensed under LGPLv3
you can find the original code on https://github.com/jellysquid3/lithium-fabric/ (Yarn mappings)
Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
diff --git a/src/main/java/net/minecraft/server/EnumAxisCycle.java b/src/main/java/net/minecraft/server/EnumAxisCycle.java
index 92ab79532d29341e8840341ff5ee8f5203cb4aad..bc7b9d0b4d9e3f7519bb013054eeec512e9342d7 100644
--- a/src/main/java/net/minecraft/server/EnumAxisCycle.java
+++ b/src/main/java/net/minecraft/server/EnumAxisCycle.java
@@ -82,6 +82,7 @@ public enum EnumAxisCycle {
public abstract int a(int i, int j, int k, EnumDirection.EnumAxis enumdirection_enumaxis);
+ public final EnumDirection.EnumAxis cycle(EnumDirection.EnumAxis axis) { return a(axis); } // Yatopia - OBFHELPER
public abstract EnumDirection.EnumAxis a(EnumDirection.EnumAxis enumdirection_enumaxis);
public abstract EnumAxisCycle a();
diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
index 98f9ded42264cb88cff701a85d22d99e203ef7cf..b94f08dcc911cd632a9c4fb93dcbc4d47aceca94 100644
--- a/src/main/java/net/minecraft/server/VoxelShape.java
+++ b/src/main/java/net/minecraft/server/VoxelShape.java
@@ -148,6 +148,7 @@ public abstract class VoxelShape {
}
}
+ public final double calculateMaxDistance(EnumDirection.EnumAxis axis, AxisAlignedBB box, double movement) { return a(axis, box, movement); } // Yatopia - OBFHELPER
public double a(EnumDirection.EnumAxis enumdirection_enumaxis, AxisAlignedBB axisalignedbb, double d0) {
return this.a(EnumAxisCycle.a(enumdirection_enumaxis, EnumDirection.EnumAxis.X), axisalignedbb, d0);
}
diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
index 877ef81bd8285167ce11c116b8ad803fda63c6c9..1bf27c47c8fcc2fb0a712b7d10a8c50cea677926 100644
--- a/src/main/java/net/minecraft/server/VoxelShapes.java
+++ b/src/main/java/net/minecraft/server/VoxelShapes.java
@@ -279,6 +279,21 @@ public final class VoxelShapes {
return 0.0D;
} else {
EnumAxisCycle enumaxiscycle1 = enumaxiscycle.a();
+ // Yatopia start
+ if (d0 < 0 || enumaxiscycle1.cycle(EnumDirection.EnumAxis.Z) == EnumDirection.EnumAxis.Y) {
+ int x = MathHelper.floor((axisalignedbb.minX + axisalignedbb.maxX) / 2);
+ int y = MathHelper.f(axisalignedbb.minY) - 1;
+ int z = MathHelper.floor((axisalignedbb.minZ + axisalignedbb.maxZ) / 2);
+ BlockPosition pos = new BlockPosition(x, y, z);
+ IBlockData data = iworldreader.getTypeIfLoaded(pos);
+ if (data != null) {
+ d0 = data.getCollisionShape(iworldreader, pos, voxelshapecollision).calculateMaxDistance(EnumDirection.EnumAxis.Y, axisalignedbb.offset(-x, -y, -z), d0);
+ if (Math.abs(d0) < 1.0E-7D) {
+ return 0.0D;
+ }
+ }
+ }
+ // Yatopia end
EnumDirection.EnumAxis enumdirection_enumaxis = enumaxiscycle1.a(EnumDirection.EnumAxis.X);
EnumDirection.EnumAxis enumdirection_enumaxis1 = enumaxiscycle1.a(EnumDirection.EnumAxis.Y);
EnumDirection.EnumAxis enumdirection_enumaxis2 = enumaxiscycle1.a(EnumDirection.EnumAxis.Z);