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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
8ce3dd5f [CI-SKIP] Fix Mojang API Brigadier dep - THIS IS NOT A NEW BUILD
00d760a5 Fix build due to spigot changing the build timestamp process
842e040c Updated Upstream (Bukkit/CraftBukkit/Spigot)
c03260a2 Add getter and setter for villager's numberOfRestocksToday (#3231)
fe366fbe null check tracker for entity metadata update - Fixes #3070
fdf41b74 Implement Brigadier Mojang API
e0ea2e0e Entity Activation Range 2.0! Major improvements to restoring behavior
10396d28 Fix Tracking Range mismatch on Vehicle/Passenger checks
This commit is contained in:
William Blake Galbreath
2020-04-28 20:14:57 -05:00
parent c0e748c0c1
commit a2db5eebbe
67 changed files with 269 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
patches/server/0101-Breedable-Polar-Bears.patch
View File

@@ -1,88 +0,0 @@
From ae0eea483459759cf76e7bd1e3cc95a7e50675d2 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
---
.../net/minecraft/server/EntityPolarBear.java | 30 ++++++++++++++++++-
.../net/pl3x/purpur/PurpurWorldConfig.java | 5 ++++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
index 0a3906bde..42fef3aba 100644
--- a/src/main/java/net/minecraft/server/EntityPolarBear.java
+++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
@@ -32,6 +32,28 @@ public class EntityPolarBear extends EntityAnimal {
public boolean requireShiftToMount() {
return world.purpurConfig.polarBearRequireShiftToMount;
}
+
+ @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
@@ -41,7 +63,7 @@ public class EntityPolarBear extends EntityAnimal {
@Override
public boolean i(ItemStack itemstack) {
- return false;
+ return world.purpurConfig.polarBearBreedableItem != null && itemstack.getItem() == world.purpurConfig.polarBearBreedableItem; // Purpur
}
@Override
@@ -51,6 +73,12 @@ public class EntityPolarBear extends EntityAnimal {
this.goalSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
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));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 01b8fffe1..ced9edf82 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -666,10 +666,15 @@ public class PurpurWorldConfig {
public boolean polarBearRidable = false;
public boolean polarBearRidableInWater = false;
public boolean polarBearRequireShiftToMount = true;
+ public String polarBearBreedableItemString = "";
+ public Item polarBearBreedableItem = null;
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
polarBearRequireShiftToMount = getBoolean("mobs.polar_bear.require-shift-to-mount", polarBearRequireShiftToMount);
+ polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
+ Item item = IRegistry.ITEM.get(new MinecraftKey(polarBearBreedableItemString));
+ if (item != Items.AIR) polarBearBreedableItem = item;
}
public boolean pufferfishRidable = false;
--
2.24.0