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] Drowning Settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 1f06a8b4102d8736755e052f03d3bfb0bbf867a1..51dcd696413efe9c2e4fbf7536b5f65fd7806f0f 100644
index e87e30d6ff41ca1097b61729a8f3f678119d6007..fe8fbb95489b2f79dff73c5fce064a90708e208b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2932,7 +2932,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2743,7 +2743,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
}
public int getMaxAirSupply() {
@@ -18,7 +18,7 @@ index 1f06a8b4102d8736755e052f03d3bfb0bbf867a1..51dcd696413efe9c2e4fbf7536b5f65f
public int getAirSupply() {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index c123e723d4fc3202eb7a4c74a356ffcde19e2ba5..0a50c0d3450430de9b6251aa65a8bfc8633a8502 100644
index 4dd6b5745ca42a067f00d2fc24056e97b242a5f7..784124b31d273f0eecb2798b6758bb4eda880544 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -425,7 +425,7 @@ public abstract class LivingEntity extends Entity {
@@ -40,10 +40,10 @@ index c123e723d4fc3202eb7a4c74a356ffcde19e2ba5..0a50c0d3450430de9b6251aa65a8bfc8
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 09e2d114105e177cc2cb291b064718333cd13f6a..ed5d3690aff4583b9d1cdc2e7fe3d18330cd06ca 100644
index 7c796c99076f510533462d46122b41a3b4128945..ab723a14cc1f0db42a4f5d34674e27cee6f5702f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -121,6 +121,15 @@ public class PurpurWorldConfig {
@@ -120,6 +120,15 @@ public class PurpurWorldConfig {
nighttimeTicks = getInt("gameplay-mechanics.daylight-cycle-ticks.nighttime", nighttimeTicks);
}