Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement squid colors for rainglow fabric mod (#1141)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0084-Totems-work-in-inventory.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index c9dd775e01da040ac6c97c0ee0147828f1cc7fdd..6a72ce966db535d9f9996bebe23aeae889cde41e 100644
index fa2404a02d32b8fdcd3a9134bde58c683d542bca..992f4ecd565f1da36c233bc32e74de25421784c9 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1544,6 +1544,19 @@ public abstract class LivingEntity extends Entity {
@@ -29,10 +29,10 @@ index c9dd775e01da040ac6c97c0ee0147828f1cc7fdd..6a72ce966db535d9f9996bebe23aeae8
event.setCancelled(itemstack == null);
this.level.getCraftServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index addbc5f93292874717e5d394e9ebd7a7a0d69394..0f36235678efa995a10474e6f7652f1782e693d7 100644
index 5ad41ae78145e0488676c2addeb0fcdccbfcda85..da29a7a36e9d7bae2fd6d8cd93c236502d24ca3d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -247,6 +247,7 @@ public class PurpurWorldConfig {
@@ -248,6 +248,7 @@ public class PurpurWorldConfig {
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
@@ -40,7 +40,7 @@ index addbc5f93292874717e5d394e9ebd7a7a0d69394..0f36235678efa995a10474e6f7652f17
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -263,6 +264,7 @@ public class PurpurWorldConfig {
@@ -264,6 +265,7 @@ public class PurpurWorldConfig {
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);