Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-12 13:44:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen

Browse Source
This commit is contained in:
Simon Gardling 2021-04-21 12:28:18 -04:00
commit d479b55a39
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
patches/server/0067-lithium-entity.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] lithium entity
Co-authored-by: Hugo Planque <hookwood01@gmail.com>
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 4cae70c41bbd977b6a5661e43a5ddd3694e89580..b62e60b0575d8195a7506ff22c7b1c542a9ca382 100644
index 4cae70c41bbd977b6a5661e43a5ddd3694e89580..29b30c159fae686a28f395d3e5a2236bc9237c1b 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -286,6 +286,10 @@ public abstract class EntityLiving extends Entity {
@ -31,11 +31,11 @@ index 4cae70c41bbd977b6a5661e43a5ddd3694e89580..b62e60b0575d8195a7506ff22c7b1c54
this.ar = this.as;
if (this.justCreated) {
this.getBedPosition().ifPresent(this::a);
@@ -1784,6 +1792,26 @@ public abstract class EntityLiving extends Entity {
@@ -1783,7 +1791,24 @@ public abstract class EntityLiving extends Entity {
}
public IBlockData ds() {
return this.world.getBlockStateIfLoaded(this.getChunkCoordinates()); // Yatopia
+ /*
- return this.world.getBlockStateIfLoaded(this.getChunkCoordinates()); // Yatopia
+ // Yatopia start - port lithium
+ int x = MathHelper.floor(this.locX());
+ int y = MathHelper.floor(this.locY());
@ -47,14 +47,13 @@ index 4cae70c41bbd977b6a5661e43a5ddd3694e89580..b62e60b0575d8195a7506ff22c7b1c54
+ return this.lastStateAtFeet;
+ }
+
+ IBlockData state = this.world.getType(getChunkCoordinates());
+ IBlockData state = this.world.getBlockStateIfLoaded(this.getChunkCoordinates());
+
+ this.lastPos = pos;
+ this.lastStateAtFeet = state;
+
+ return state;
+ // Yatopia end
+ */
}
private boolean c(BlockPosition blockposition, IBlockData iblockdata) {