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

Add configurable minecart speed and move controllable minecart options

Browse Source
This commit is contained in:
BillyGalbreath
2021-04-27 17:32:43 -05:00
parent 3dce9755f3
commit 9fd776eb9a
135 changed files with 477 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0104-Ridables.patch
View File

@@ -68,10 +68,10 @@ index 0000000000000000000000000000000000000000..8b66d1215a6eef1302b5ecb46a4b3d50
+ }
+}
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
index 77a49f76927e65874ae35f7709bef1b041bf77a6..4f641d43c3d26c50b58caf8d6c2f05a9e077236a 100644
index 53c2bb5af825255e8c786bf02052f41c5d3e270b..af0253aecc8f3a4125b37aed4548c13b7ad6260a 100644
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
@@ -643,6 +643,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -642,6 +642,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
this.advancementDataPlayer.b(this);
@@ -5541,7 +5541,7 @@ index a19a26a88f247d359354902efeece9923f3e0e0b..1119f60890784d953c2cd4e0078af4d0
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 76a1f157dc4ae0fdf804f3340b72dfa17ffbbb94..b587c96084a1ec3dd8fdec5a830fb8680e33e729 100644
index 3b20793e3eb4349f8a4ce724f8fc0d6366bb28c2..9789d0f9f73540a486befcdd4901014efeed8403 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -137,11 +137,13 @@ public class PurpurConfig {
@@ -5559,7 +5559,7 @@ index 76a1f157dc4ae0fdf804f3340b72dfa17ffbbb94..b587c96084a1ec3dd8fdec5a830fb868
public static int dungeonSeed = -1;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6fc50d0f05 100644
index ffb53daed6bb08d4f448f4d0a6fee6d10710541b..8db7dca08fe4f0e88c950179f62ecd0d17bc329c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -42,11 +42,6 @@ public class PurpurWorldConfig {
@@ -5574,7 +5574,7 @@ index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6f
private ConfigurationSection getConfigurationSection(String path) {
ConfigurationSection section = PurpurConfig.config.getConfigurationSection("world-settings." + worldName + "." + path);
return section != null ? section : PurpurConfig.config.getConfigurationSection("world-settings.default." + path);
@@ -339,61 +334,186 @@ public class PurpurWorldConfig {
@@ -373,61 +368,186 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}
@@ -5761,7 +5761,7 @@ index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6f
public float giantStepHeight = 2.0F;
public float giantJumpHeight = 1.0F;
public double giantMovementSpeed = 0.5D;
@@ -402,6 +522,8 @@ public class PurpurWorldConfig {
@@ -436,6 +556,8 @@ public class PurpurWorldConfig {
public boolean giantHaveHostileAI = false;
public double giantMaxHealth = 100.0D;
private void giantSettings() {
@@ -5770,7 +5770,7 @@ index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6f
giantStepHeight = (float) getDouble("mobs.giant.step-height", giantStepHeight);
giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight);
giantMovementSpeed = getDouble("mobs.giant.movement-speed", giantMovementSpeed);
@@ -416,19 +538,44 @@ public class PurpurWorldConfig {
@@ -450,19 +572,44 @@ public class PurpurWorldConfig {
giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
}
@@ -5815,7 +5815,7 @@ index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6f
illusionerMovementSpeed = getDouble("mobs.illusioner.movement-speed", illusionerMovementSpeed);
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
if (PurpurConfig.version < 8) {
@@ -439,11 +586,76 @@ public class PurpurWorldConfig {
@@ -473,11 +620,76 @@ public class PurpurWorldConfig {
illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max-health", illusionerMaxHealth);
}
@@ -5892,7 +5892,7 @@ index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6f
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -462,7 +674,13 @@ public class PurpurWorldConfig {
@@ -496,7 +708,13 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -5906,7 +5906,7 @@ index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6f
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
@@ -481,42 +699,187 @@ public class PurpurWorldConfig {
@@ -515,42 +733,187 @@ public class PurpurWorldConfig {
phantomBurnInLight = getInt("mobs.phantom.burn-in-light", phantomBurnInLight);
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
@@ -6094,7 +6094,7 @@ index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6f
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerCanBeLeashed = false;
@@ -526,6 +889,8 @@ public class PurpurWorldConfig {
@@ -560,6 +923,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
private void villagerSettings() {
@@ -6103,7 +6103,7 @@ index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6f
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
@@ -536,45 +901,108 @@ public class PurpurWorldConfig {
@@ -570,45 +935,108 @@ public class PurpurWorldConfig {
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
}