Rebase on latest Purpur (#230)

This commit is contained in:
Encode42
2021-03-24 20:26:18 -04:00
committed by GitHub
parent 754948e524
commit b6235af624
94 changed files with 261 additions and 249 deletions

View File

@@ -17,7 +17,7 @@ index 5ea059cde9e1a089c2ade12512e4a7abd07c5b8a..97eb81338207c93125bea08225638494
return this == block;
}
diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
index 2ec82dcb9d989590e59f88a02d1c205b3200cadc..8d21f9451c60873d1524ad64876094e6e21509e4 100644
index aa78176ddd9eced179ceb8e53a1884172490f059..936933ab4c9e78877e1a2fc250721c2158e3810c 100644
--- a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
@@ -740,6 +740,7 @@ public abstract class BlockBase {
@@ -42,7 +42,7 @@ index 3f8a674345bcad8289a48d2daa5e2a283528e952..3c35f5d171df518f491cad1f49882622
private final GeneratorAccess b;
private final EnumDirection.EnumAxis c;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 2e9cec2d70ab4af5603552ebf8f0c0fa52ccfbe5..c61595aa6e42a4cc096bda9126d23c465f8bd3de 100644
index 5238111a10ca8fcec1dda4cfed1e9c47b1245883..648c496390bbf663df39429631514a1245c3f72d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -180,6 +180,7 @@ public class PurpurConfig {