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

add back random populator seed

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-06-25 18:46:30 -04:00
parent 6d5a686a1d
commit 44e4acda63
151 changed files with 601 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0004-Configurable-entity-base-attributes.patch
View File

@@ -414,7 +414,7 @@ index 4d5ceb4ce913248ad404393e4f0c75cad24029bb..5ab75a110d45dd9a2c341820b53838a5
public static String getPredefinedName(int variant) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index c86f13d190b41cb18dd833af39c7b4916068fd69..31568adcf4a89b11e61f455a15326c7f72bf487e 100644
index 631539a752a038926355c23aeb160af64f363a61..66c01b8300bc09ace27e4d1a30ee9274c69fcc9a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -100,6 +100,11 @@ public class Turtle extends Animal {
@@ -706,7 +706,7 @@ index d328e36015b6b7d6a9e093fbe232eb5ecda46d96..6ca7b168a1ea26102922d9377e52662f
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index a1a64591e6a6fb8a4550b91f89e3cdbd35c6d249..1f40e8d1e73fec0aaee29c658e3d24f499fa9501 100644
index 00e74d4fb1c719475bed27db13774bc7cc7447a7..177c5b385613ac08a75500013326874ff31a1992 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -154,6 +154,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -990,7 +990,7 @@ index 7d39f25734f2c52b11931e141524acd2c244c2c5..87aae8fa18704e58f2b1fc0abd1a9898
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index 60bfeb0e5a667899a02fb59c13d637d87416e483..359f5d01d144121e0ea129aebc45b3e796c16bf7 100644
index 61aff98a7b56eab6a43ddc9f07618cbbedb6b77d..5e069ac0c57d2a3a23f6e4483d12ce298d172691 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -112,6 +112,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -1038,7 +1038,7 @@ index 32ef769b2b3e3ab42c7a50bf4c8ec7ec548d5e7b..b8c753a574487cdc045ea334229aafd2
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
index 9dc36967a63ef3753e798b237b05f45fdc48135f..176c68513669c7bbcee49b56456ba470c98916b6 100644
index 42635be6183d86978df3f174c74a71691f2bfcdd..d6fdaa9f9033d8b1e8aa9ef0aace387e286ebce9 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
@@ -102,6 +102,11 @@ public class Shulker extends AbstractGolem implements Enemy {
@@ -1417,12 +1417,12 @@ index d6c31596e21041a124a263054ccb6447829eccdd..d2588a91b55aebdecf8e1644498111cc
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9d261356c549a41e4bd676d5be60f6470501f0ae..c4fb8a14bf11df94acc7806f458e976c4e30e7c4 100644
index 8699631fecc1bcaa943514a012ea042a3c425af5..70afdc5bd924e3a3e812d4029887da1208526cae 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,7 +1,10 @@
package net.pl3x.purpur;
@@ -2,7 +2,10 @@ package net.pl3x.purpur;
import net.minecraft.server.level.ServerLevel;
import org.bukkit.configuration.ConfigurationSection;
+
+import java.util.HashMap;
@@ -1431,7 +1431,7 @@ index 9d261356c549a41e4bd676d5be60f6470501f0ae..c4fb8a14bf11df94acc7806f458e976c
import static net.pl3x.purpur.PurpurConfig.log;
public class PurpurWorldConfig {
@@ -67,257 +70,573 @@ public class PurpurWorldConfig {
@@ -69,257 +72,573 @@ public class PurpurWorldConfig {
}
public boolean axolotlRidable = false;
@@ -2005,7 +2005,7 @@ index 9d261356c549a41e4bd676d5be60f6470501f0ae..c4fb8a14bf11df94acc7806f458e976c
}
public boolean phantomRidable = false;
@@ -326,6 +645,7 @@ public class PurpurWorldConfig {
@@ -328,6 +647,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -2013,7 +2013,7 @@ index 9d261356c549a41e4bd676d5be60f6470501f0ae..c4fb8a14bf11df94acc7806f458e976c
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -333,255 +653,559 @@ public class PurpurWorldConfig {
@@ -335,255 +655,559 @@ public class PurpurWorldConfig {
phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);