Preliminary update to 1.17.1

This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions

View File

@@ -17,7 +17,7 @@ index d24c569f00786b2bde953429aad57025abee72d6..44d837f624e2a23b0412cca4c0646f48
public static final GsonComponentSerializer GSON = GsonComponentSerializer.builder()
.legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.INSTANCE)
diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
index bd52d7d19060b0922c5165a071a5d12123028f79..6322251336a4300649f207efdb4d404d25023c9a 100644
index f68639508d7ff9a0e743b5282301e62435d53656..89d4b7e4cd4222b61b49833fceda56ffa39710fa 100644
--- a/src/main/java/net/minecraft/world/item/Items.java
+++ b/src/main/java/net/minecraft/world/item/Items.java
@@ -258,7 +258,7 @@ public class Items {
@@ -138,10 +138,10 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63
return i;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6c1fb8ac40e8d90714e397d1985498ad650e24b0..a96d7cad39076b08ee43849d3014e71d1c3d4a82 100644
index add5f7a9929835e7f2383ba13e50b4e8fc1b52e9..60787c43d992674a94b4229e27504cb5cd518cff 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -108,6 +108,31 @@ public class PurpurWorldConfig {
@@ -107,6 +107,31 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}