Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Optimize physics"

Browse Source 
This reverts commit b83eb29260.
This commit is contained in:
Sotr
2019-03-29 22:58:31 +08:00
parent 48d3ceef61
commit a0256c7a5b
4 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/akarin/server/core/AkarinAsyncScheduler.java
View File

@@ -2,8 +2,6 @@ package io.akarin.server.core;
import java.util.List;
import javax.swing.text.html.parser.Entity;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

14
src/main/java/net/minecraft/server/BlockPosition.java
View File

@@ -20,20 +20,6 @@ public class BlockPosition extends BaseBlockPosition {
private static final long i = (1L << BlockPosition.c) - 1L;
private static final long j = (1L << BlockPosition.f) - 1L;
private static final long k = (1L << BlockPosition.d) - 1L;
// Akarin start
protected BlockPosition shiftX(int x) {
this.x = this.x + x;
return this;
}
protected BlockPosition shiftY(int y) {
this.y = this.y + y;
return this;
}
protected BlockPosition shiftZ(int z) {
this.z = this.z + z;
return this;
}
// Akarin end
public BlockPosition(int i, int j, int k) {
super(i, j, k);

12
src/main/java/net/minecraft/server/World.java
View File

@@ -641,12 +641,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
public void applyPhysics(BlockPosition blockposition, Block block) {
if (captureBlockStates) { return; } // Paper - Cancel all physics during placement
this.a(blockposition.shiftX(-1), block, blockposition); // Akarin - west
this.a(blockposition.shiftX(2), block, blockposition); // Akarin - east
this.a(blockposition.shiftX(-1).shiftY(-1), block, blockposition); // Akarin - down
this.a(blockposition.shiftY(2), block, blockposition); // Akarin - up
this.a(blockposition.shiftY(-1).shiftZ(-1), block, blockposition); // Akarin - north
this.a(blockposition.shiftZ(2), block, blockposition); // Akarin - south
this.a(blockposition.west(), block, blockposition);
this.a(blockposition.east(), block, blockposition);
this.a(blockposition.down(), block, blockposition);
this.a(blockposition.up(), block, blockposition);
this.a(blockposition.north(), block, blockposition);
this.a(blockposition.south(), block, blockposition);
}
public void a(BlockPosition blockposition, Block block, EnumDirection enumdirection) {