Implement squid colors for rainglow fabric mod (#1141)

This commit is contained in:
BillyGalbreath
2022-10-01 18:18:16 -05:00
committed by GitHub
parent 69c104dc6e
commit f093c6481e
202 changed files with 1064 additions and 935 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 9bb19e7a112c1411bb6b717de983c0359f6b0cb6..cb90fec7558923f547bab2d37ceffd67c07501ce 100644
index 4dbe0ed1a9bfd97450cb28ba2d105c25d1416c6a..0f2260e3c5bad76f691bdfa144f9a340a3e34a5e 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1747,6 +1747,7 @@ public abstract class LivingEntity extends Entity {
@@ -25,10 +25,10 @@ index 9bb19e7a112c1411bb6b717de983c0359f6b0cb6..cb90fec7558923f547bab2d37ceffd67
// CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8e6bc5815e9624c6eb24e66cdba6d95989de4aae..ec5821991becc54f132b97806000759268558450 100644
index e4b920976dab1d29d686f7948fb3f8bdd643288b..1d5aecb050f6ef6237ea8c1c32b41741477fdf54 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,11 @@ public class PurpurWorldConfig {
@@ -98,6 +98,11 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}