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

@@ -93,7 +93,7 @@ index a0d8afdee5db3202d3693ad4d10b61fc3b942920..7bca861c3ebfc7550b82ae74483464b1
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5d80cdc482a630bd7951ee8010b0be5d86a74d2f..47f0743ecc1bef6ce55e4ae0c4cbc31a428332df 100644
index ff25c6b60ebbcf562313a04632c81bcd8a3cd5ab..63236e74b787a594da60e42dc4314faec1d624c6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1305,6 +1305,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -108,10 +108,10 @@ index 5d80cdc482a630bd7951ee8010b0be5d86a74d2f..47f0743ecc1bef6ce55e4ae0c4cbc31a
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c1217325ed03d3546e04d6dee15351b26ce6ed3a..5ce92e94071adad81d252dc9f63b3b468bdedcb7 100644
index 7988b6b572c83787ff0ab5f73ae49f097d8b391a..ea6af61304f6384009a2a661c042854a29c3f50b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -119,6 +119,7 @@ public class PurpurWorldConfig {
@@ -120,6 +120,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean fireballsBypassMobGriefing = false;
@@ -119,7 +119,7 @@ index c1217325ed03d3546e04d6dee15351b26ce6ed3a..5ce92e94071adad81d252dc9f63b3b46
public boolean milkCuresBadOmen = true;
public boolean noteBlockIgnoreAbove = false;
public boolean persistentDroppableEntityDisplayNames = false;
@@ -136,6 +137,7 @@ public class PurpurWorldConfig {
@@ -137,6 +138,7 @@ public class PurpurWorldConfig {
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);