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

flip some config defaults for vanilla parity

Browse Source
This commit is contained in:
Ben
2023-03-18 20:49:11 -04:00
parent 4715a7ea3a
commit 808b1cbde5
136 changed files with 695 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0131-Config-to-always-tame-in-Creative.patch
View File

@@ -20,7 +20,7 @@ index 5c64905e90ccca6e0b347241ddf9cc3f71058b8e..3bd7521b131b2b40f807bdc7ab95e64c
return;
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
index 60259730eef583c13a07f6ac2a41a2a8db96dd7a..05edeb6da8181aa7e2d01d64bc5fbb8993f35c2f 100644
index c1ec34249d07a22708905c593ffd61593935d7ef..029b94287acc5b79662aabe8c9783ac823abd7d1 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
@@ -470,7 +470,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
@@ -33,7 +33,7 @@ index 60259730eef583c13a07f6ac2a41a2a8db96dd7a..05edeb6da8181aa7e2d01d64bc5fbb89
this.setOrderedToSit(true);
this.level.broadcastEntityEvent(this, (byte) 7);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
index 1638b0f23ef2247c6d1055529f47d71ef56b0f55..9228dc98360ff34e4cdd105be36ed249c5b67067 100644
index 94c9303cf76ea35c5584125a04aadd1772efb7dc..f7efb2088c554782fd169b901b4ef3fca3b2c0f9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
@@ -334,7 +334,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -46,7 +46,7 @@ index 1638b0f23ef2247c6d1055529f47d71ef56b0f55..9228dc98360ff34e4cdd105be36ed249
this.level.broadcastEntityEvent(this, (byte) 7);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index dc85d95b430e4883eb6508261a4eeee5723d3e40..72b3c31809c09fe0e297bbfc50ed82b070d215da 100644
index a2500bde559cd191bff6811802ff12980c7be418..5cf066e8a4b1b0b3b68f734dfbfb97ef3f98d205 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -537,7 +537,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -59,10 +59,10 @@ index dc85d95b430e4883eb6508261a4eeee5723d3e40..72b3c31809c09fe0e297bbfc50ed82b0
this.navigation.stop();
this.setTarget((LivingEntity) null);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index fb2aa8f5e3d7e53c5eac037e5dfca25a03e6ca9c..0fb18cb415132aaf26f3688599a40843b618b187 100644
index 1508aa1e00988164ee588c1ec19aeea47711430d..c79afaceaa8272cb9d74e7c3a6e9a14472576b39 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 {
@@ -111,6 +111,7 @@ public class PurpurWorldConfig {
}
public boolean useBetterMending = false;
@@ -70,7 +70,7 @@ index fb2aa8f5e3d7e53c5eac037e5dfca25a03e6ca9c..0fb18cb415132aaf26f3688599a40843
public boolean boatEjectPlayersOnLand = false;
public boolean boatsDoFallDamage = true;
public boolean disableDropsOnCrammingDeath = false;
@@ -137,6 +138,7 @@ public class PurpurWorldConfig {
@@ -124,6 +125,7 @@ public class PurpurWorldConfig {
public int animalBreedingCooldownSeconds = 0;
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);