mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
714f0a04d0
Upstream has released updates that appears to apply and compile correctly Paper Changes: 60135676 [Auto] Updated Upstream (CraftBukkit) fa90052a Fix MC-125757 (#3859) 071c08d7 Only convert lore lines that actually look legacy 8c4787e3 Misc Improvements to Async Teleporting and Light patch 6133c83b [Auto] Updated Upstream (Bukkit/CraftBukkit)
96 lines
4.2 KiB
Diff
96 lines
4.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Thu, 26 Mar 2020 19:46:44 -0500
|
|
Subject: [PATCH] Breedable Polar Bears
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
|
|
index 69e5c1aed..c26fd0e18 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPolarBear.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
|
|
@@ -21,6 +21,30 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
|
|
super(entitytypes, world);
|
|
}
|
|
|
|
+ // Purpur start
|
|
+ @Override
|
|
+ public boolean mate(EntityAnimal entityanimal) {
|
|
+ if (entityanimal == this) {
|
|
+ return false;
|
|
+ } else if (this.isStanding()) {
|
|
+ return false;
|
|
+ } else if (this.getGoalTarget() != null) {
|
|
+ return false;
|
|
+ } else if (!(entityanimal instanceof EntityPolarBear)) {
|
|
+ return false;
|
|
+ } else {
|
|
+ EntityPolarBear polarbear = (EntityPolarBear) entityanimal;
|
|
+ if (polarbear.isStanding()) {
|
|
+ return false;
|
|
+ }
|
|
+ if (polarbear.getGoalTarget() != null) {
|
|
+ return false;
|
|
+ }
|
|
+ return this.isInLove() && polarbear.isInLove();
|
|
+ }
|
|
+ }
|
|
+ // Purpur end
|
|
+
|
|
@Override
|
|
public EntityAgeable createChild(EntityAgeable entityageable) {
|
|
return (EntityAgeable) EntityTypes.POLAR_BEAR.a(this.world);
|
|
@@ -28,7 +52,7 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
|
|
|
|
@Override
|
|
public boolean k(ItemStack itemstack) {
|
|
- return false;
|
|
+ return world.purpurConfig.polarBearBreedableItem != null && itemstack.getItem() == world.purpurConfig.polarBearBreedableItem; // Purpur;
|
|
}
|
|
|
|
@Override
|
|
@@ -37,6 +61,12 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
|
|
this.goalSelector.a(0, new PathfinderGoalFloat(this));
|
|
this.goalSelector.a(1, new EntityPolarBear.c());
|
|
this.goalSelector.a(1, new EntityPolarBear.d());
|
|
+ // Purpur start
|
|
+ if (world.purpurConfig.polarBearBreedableItem != null) {
|
|
+ this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
|
|
+ this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, RecipeItemStack.a(world.purpurConfig.polarBearBreedableItem), false));
|
|
+ }
|
|
+ // Purpur end
|
|
this.goalSelector.a(4, new PathfinderGoalFollowParent(this, 1.25D));
|
|
this.goalSelector.a(5, new PathfinderGoalRandomStroll(this, 1.0D));
|
|
this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
|
|
@@ -178,10 +208,12 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
|
|
return flag;
|
|
}
|
|
|
|
+ public boolean isStanding() { return eN(); } // Purpur - OBFHELPER
|
|
public boolean eN() {
|
|
return (Boolean) this.datawatcher.get(EntityPolarBear.bv);
|
|
}
|
|
|
|
+ public void setStanding(boolean standing) { t(standing); } // Purpur - OBFHELPER
|
|
public void t(boolean flag) {
|
|
this.datawatcher.set(EntityPolarBear.bv, flag);
|
|
}
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index a98dd59b8..9b6bd8f41 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -147,6 +147,14 @@ public class PurpurWorldConfig {
|
|
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
|
|
}
|
|
|
|
+ public String polarBearBreedableItemString = "";
|
|
+ public Item polarBearBreedableItem = null;
|
|
+ private void polarBearSettings() {
|
|
+ polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
|
|
+ Item item = IRegistry.ITEM.get(new MinecraftKey(polarBearBreedableItemString));
|
|
+ if (item != Items.AIR) polarBearBreedableItem = item;
|
|
+ }
|
|
+
|
|
public double rabbitNaturalToast = 0.0D;
|
|
public double rabbitNaturalKiller = 0.0D;
|
|
private void rabbitSettings() {
|