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

Change some default config options to match vanilla behaviors

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-28 06:35:15 -05:00
parent 6b2be588df
commit b9c7dca7b8
17 changed files with 180 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From 1dc75ffb5b36e250b78c01c716e7d09c7eb74a65 Mon Sep 17 00:00:00 2001
From f6099f4243f8aff62dda9f6d2d8fe99732941d58 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -430,7 +430,7 @@ index 1e3782122a..c0b066d188 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index c3aef0b2a1..a79ce9296a 100644
index 0c00a86a84..2e3d6b657f 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -9,11 +9,13 @@ public class EntityCow extends EntityAnimal {
@@ -446,7 +446,7 @@ index c3aef0b2a1..a79ce9296a 100644
+ this.goalSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
this.goalSelector.a(1, new PathfinderGoalPanic(this, 2.0D));
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT, Blocks.RED_MUSHROOM.getItem(), Blocks.BROWN_MUSHROOM.getItem()), false));
if (net.pl3x.purpur.PurpurConfig.feedMushroomsToCows > 0) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT, Blocks.RED_MUSHROOM.getItem(), Blocks.BROWN_MUSHROOM.getItem()), false)); else // Purpur
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index bcb7276308..038ff1d93c 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -1091,7 +1091,7 @@ index 1160929e1b..3318e274f8 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 8771fb37da..7418ef4916 100644
index 5d3e48ba61..2a943f3160 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -362,9 +362,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1251,7 +1251,7 @@ index 8e463111bb..2c34ab337a 100644
this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D));
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 49cbd682fc..f5504b6953 100644
index 0054d3bed5..2b7925b5d4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -87,10 +87,10 @@ public abstract class EntityLiving extends Entity {
@@ -1651,7 +1651,7 @@ index a7cdb5e7a2..0eeb110554 100644
this.goalSelector.a(2, this.goalSit);
this.goalSelector.a(2, new PathfinderGoalFollowOwnerParrot(this, 1.0D, 5.0F, 1.0F));
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 2d62248fcc..38551c94f4 100644
index 7bc7b33665..69a1c79e74 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -15,12 +15,14 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -1674,10 +1674,10 @@ index 2d62248fcc..38551c94f4 100644
protected void initPathfinder() {
// Purpur start
+ this.goalSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
this.goalSelector.a(1, new FindCrystalGoal(this));
this.goalSelector.a(2, new OrbitCrystalGoal(this));
this.goalSelector.a(3, new EntityPhantom.c()); // PickAttackGoal
@@ -44,6 +47,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
if (net.pl3x.purpur.PurpurConfig.phantomsOrbitCrystalsRadius > 0) {
this.goalSelector.a(1, new FindCrystalGoal(this));
this.goalSelector.a(2, new OrbitCrystalGoal(this));
@@ -46,6 +49,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
protected void initAttributes() {
super.initAttributes();
this.getAttributeMap().b(GenericAttributes.ATTACK_DAMAGE);
@@ -1685,7 +1685,7 @@ index 2d62248fcc..38551c94f4 100644
}
@Override
@@ -107,7 +111,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -109,7 +113,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@Override
public void movementTick() {
@@ -1694,7 +1694,7 @@ index 2d62248fcc..38551c94f4 100644
this.setOnFire(8);
}
@@ -606,14 +610,23 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -607,14 +611,23 @@ public class EntityPhantom extends EntityFlying implements IMonster {
}
}
@@ -1720,7 +1720,7 @@ index 2d62248fcc..38551c94f4 100644
}
class d extends EntityAIBodyControl {
@@ -629,7 +642,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -630,7 +643,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
}
}
@@ -1729,7 +1729,7 @@ index 2d62248fcc..38551c94f4 100644
private float j = 0.1F;
@@ -637,8 +650,19 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -638,8 +651,19 @@ public class EntityPhantom extends EntityFlying implements IMonster {
super(entityinsentient);
}
@@ -2159,7 +2159,7 @@ index 253ff9594c..af3876a6c8 100644
this.setMot(vec3d.x, 0.41999998688697815D, vec3d.z);
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 1fed1d6e75..0f612b8f44 100644
index 42d0c0017d..984747f999 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -13,10 +13,12 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -2643,7 +2643,7 @@ index da8a8c8551..bf0ea521a5 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 7faa0c6ac7..158cd07b17 100644
index feab5b66f8..2b67041f45 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -131,6 +131,11 @@ public class PurpurConfig {
@@ -2655,10 +2655,10 @@ index 7faa0c6ac7..158cd07b17 100644
+ requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
+ }
+
public static int feedMushroomsToCows = 5;
public static int feedMushroomsToCows = 0;
private static void cowsSettings() {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
@@ -142,4 +147,121 @@ public class PurpurConfig {
@@ -151,4 +156,121 @@ public class PurpurConfig {
snowmanDropsPumpkin = getBoolean("settings.mobs.snow_golem.drops-pumpkin-when-sheared", snowmanDropsPumpkin);
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}