More compile fixes

This commit is contained in:
Zach Brown
2019-12-12 19:18:18 -06:00
parent b0dc983f21
commit 4565495711
30 changed files with 230 additions and 151 deletions

View File

@@ -1,4 +1,4 @@
From 96fb816d07d1115f2a2dd941c55277d4c248ff14 Mon Sep 17 00:00:00 2001
From 5225647a32d31190b65163bd55c830f46e18761b Mon Sep 17 00:00:00 2001
From: theosib <millerti@172.16.221.1>
Date: Thu, 27 Sep 2018 01:43:35 -0600
Subject: [PATCH] Optimize redstone algorithm
@@ -1124,10 +1124,10 @@ index 5bf2fc0b3..52a4982ec 100644
c(iblockdata, world, blockposition);
world.a(blockposition, false);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 8e3367435..e8f83627c 100644
index 3e4632425..3e7ba9be6 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -526,6 +526,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -538,6 +538,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
@@ -1135,7 +1135,7 @@ index 8e3367435..e8f83627c 100644
public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) {
if (!this.isClientSide) {
IBlockData iblockdata = this.getType(blockposition);
@@ -1275,6 +1276,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1287,6 +1288,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0))));
}
@@ -1144,5 +1144,5 @@ index 8e3367435..e8f83627c 100644
int i = 0;
EnumDirection[] aenumdirection = World.a;
--
2.17.1
2.24.0