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

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 509a4239dbda8d8d7edebfdc92bed84a13def369..018fe34b41612645579308a4d237a416a88d9102 100644
index 42fd259f4492e539112b5bcb310aaaadab58a443..d1bd5d4fea39c77a853a6e79e589e40a6197f2df 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2308,7 +2308,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
@@ -2277,7 +2277,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
public class TrackedEntity {
@@ -18,7 +18,7 @@ index 509a4239dbda8d8d7edebfdc92bed84a13def369..018fe34b41612645579308a4d237a416
private final int range;
SectionPos lastSectionPos;
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 8218a074cdbe9df514f4de5aefd3c2669ec65250..a81cab45301ee882ee25cbe8fd35232958536341 100644
index dc821e0565be38171922546208423613b7682de8..096be832a8b37a8e92064258b74918aa04aa7243 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -68,7 +68,7 @@ public class ServerEntity {
@@ -94,10 +94,10 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 93348fe8e75088755a53d4bc5e347bc5642b0635..fa3e4e8fdfd5220aab2d84158f72d358feb75623 100644
index 6b5f7f895a9e53582bd2dee373b8b2eb1899e2da..180d1c9a552b6d96dd7a30f991bb375c299e4ddb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -111,6 +111,49 @@ public class PurpurWorldConfig {
@@ -110,6 +110,49 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
}