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

Fix up ridable foxes

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-07 20:37:01 -05:00
parent d92210e9b6
commit 376ba1d327
23 changed files with 266 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/source/configuration.rst
View File

@@ -48,11 +48,6 @@ packed-barrels
* **default**: true
* **description:** Use large size barrels (6 rows, aka 54 slots)
ender-dragon-death-always-places-egg-block
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* **default**: true
* **description:** When true all valid ender dragon deaths will place an ender egg block on top of the portal
logger
~~~~~~
* show-duplicate-entity-uuid-errors
@@ -65,11 +60,20 @@ logger
mobs
~~~~
* require-shift-to-mount
- **default**: true
- **description**: Require shift click to mount otherwise non-ridable mobs
* cow
* feed-mushrooms-for-mooshroom
- **default**: 5
- **description**: Number of mushrooms to feed a cow to make it transform into a mooshroom. Set to 0 to disable.
* ender-dragon
* death-always-places-egg-block
- **default**: true
- **description:** When true all valid ender dragon deaths will place an ender egg block on top of the portal
* giant
* naturally-spawn
- **default**: true

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

@@ -1,11 +1,11 @@
From 245036aa7d09e688b1724035e820b2c9ec8a2779 Mon Sep 17 00:00:00 2001
From cdf6e6aabed0afe8377cbb11e4dc1998d8cf2163 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
---
.../server/ControllerLookDolphin.java | 4 +-
.../java/net/minecraft/server/Entity.java | 10 +-
.../java/net/minecraft/server/Entity.java | 25 +++-
.../net/minecraft/server/EntityAgeable.java | 2 +-
.../java/net/minecraft/server/EntityBat.java | 2 +
.../net/minecraft/server/EntityBlaze.java | 3 +-
@@ -22,7 +22,7 @@ Subject: [PATCH] Integrate ridables
.../net/minecraft/server/EntityEndermite.java | 3 +-
.../net/minecraft/server/EntityEvoker.java | 3 +-
.../java/net/minecraft/server/EntityFish.java | 20 +--
.../java/net/minecraft/server/EntityFox.java | 1 +
.../java/net/minecraft/server/EntityFox.java | 57 ++++++--
.../net/minecraft/server/EntityGhast.java | 1 +
.../minecraft/server/EntityGiantZombie.java | 2 +
.../net/minecraft/server/EntityGuardian.java | 27 +++-
@@ -36,9 +36,9 @@ Subject: [PATCH] Integrate ridables
.../minecraft/server/EntityHorseZombie.java | 7 +-
.../net/minecraft/server/EntityHuman.java | 14 +-
.../server/EntityIllagerIllusioner.java | 1 +
.../minecraft/server/EntityInsentient.java | 59 +++++++-
.../minecraft/server/EntityInsentient.java | 51 ++++++-
.../net/minecraft/server/EntityIronGolem.java | 1 +
.../net/minecraft/server/EntityLiving.java | 24 +++-
.../net/minecraft/server/EntityLiving.java | 25 +++-
.../net/minecraft/server/EntityLlama.java | 37 ++++-
.../minecraft/server/EntityLlamaTrader.java | 1 +
.../net/minecraft/server/EntityMagmaCube.java | 3 +-
@@ -64,7 +64,7 @@ Subject: [PATCH] Integrate ridables
.../net/minecraft/server/EntitySlime.java | 3 +-
.../net/minecraft/server/EntitySnowman.java | 2 +
.../net/minecraft/server/EntitySpider.java | 1 +
.../net/minecraft/server/EntitySquid.java | 47 +++++++
.../net/minecraft/server/EntitySquid.java | 47 ++++++
.../server/EntityTameableAnimal.java | 6 +
.../minecraft/server/EntityTropicalFish.java | 1 +
.../net/minecraft/server/EntityTurtle.java | 1 +
@@ -79,14 +79,14 @@ Subject: [PATCH] Integrate ridables
.../net/minecraft/server/EntityZombie.java | 1 +
.../minecraft/server/EntityZombieHusk.java | 1 +
.../server/EntityZombieVillager.java | 1 +
.../java/net/pl3x/purpur/PurpurConfig.java | 131 ++++++++++++++++++
.../java/net/pl3x/purpur/PurpurConfig.java | 136 ++++++++++++++++++
.../purpur/controller/ControllerLookWASD.java | 74 ++++++++++
.../purpur/controller/ControllerMoveWASD.java | 77 ++++++++++
.../controller/ControllerMoveWASDFlying.java | 58 ++++++++
.../controller/ControllerMoveWASDWater.java | 42 ++++++
.../craftbukkit/entity/CraftLivingEntity.java | 10 ++
.../bukkit/craftbukkit/entity/CraftMob.java | 12 ++
82 files changed, 780 insertions(+), 81 deletions(-)
82 files changed, 838 insertions(+), 92 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -114,7 +114,7 @@ index 454627f65..df3d6cf28 100644
this.d = false;
this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a7db5163e..d0a13d14d 100644
index ba8a8782d..59ac50e2f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -142,26 +142,46 @@ index a7db5163e..d0a13d14d 100644
public boolean noclip;
public float M;
protected final Random random;
@@ -2072,6 +2074,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2072,6 +2074,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// Spigot end
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.getRidingPassenger() instanceof EntityHuman)) {
this.passengers.add(0, entity);
+ this.rider = (EntityHuman) entity; // Purpur
+ onMount(rider);
} else {
this.passengers.add(entity);
}
@@ -2110,6 +2113,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2110,6 +2114,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
+ // Purpur start
+ if (passengers.get(0) == rider) {
+ onDismount(rider);
+ rider = null;
+ }
+ // Purpur end
this.passengers.remove(entity);
entity.j = 60;
}
@@ -3221,4 +3231,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setMot(double d0, double d1, double d2) {
this.setMot(new Vec3D(d0, d1, d2));
}
+
+ // Purpur start
+ public void onMount(EntityHuman entityhuman) {
+ entityhuman.setJumping(false); // fixes jump on mount
+ }
+
+ public void onDismount(EntityHuman entityhuman) {
+ }
+
+ public boolean onSpacebar() {
+ return false;
+ }
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
index e87754ef3..553245ebe 100644
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
@@ -509,7 +529,7 @@ index a28fbdf1e..36229a2c4 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 14046c98d..a8597f593 100644
index 14046c98d..ce852cba3 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -48,6 +48,7 @@ public class EntityFox extends EntityAnimal {
@@ -520,6 +540,165 @@ index 14046c98d..a8597f593 100644
this.lookController = new EntityFox.k();
this.moveController = new EntityFox.m();
this.a(PathType.DANGER_OTHER, 0.0F);
@@ -155,7 +156,7 @@ public class EntityFox extends EntityAnimal {
}
private boolean j(ItemStack itemstack) {
- return itemstack.getItem().isFood() && this.getGoalTarget() == null && this.onGround && !this.isSleeping();
+ return getRider() == null && itemstack.getItem().isFood() && this.getGoalTarget() == null && this.onGround && !this.isSleeping(); // Purpur
}
@Override
@@ -367,6 +368,7 @@ public class EntityFox extends EntityAnimal {
@Override
public boolean e(ItemStack itemstack) {
+ if (getRider() != null) return false; // Purpur - do not pickup items when being ridden
EnumItemSlot enumitemslot = EntityInsentient.h(itemstack);
return !this.getEquipment(enumitemslot).isEmpty() ? false : enumitemslot == EnumItemSlot.MAINHAND && super.e(itemstack);
@@ -374,12 +376,14 @@ public class EntityFox extends EntityAnimal {
@Override
protected boolean g(ItemStack itemstack) {
+ if (getRider() != null) return false; // Purpur - do not pickup items when being ridden
Item item = itemstack.getItem();
ItemStack itemstack1 = this.getEquipment(EnumItemSlot.MAINHAND);
return itemstack1.isEmpty() || this.bP > 0 && item.isFood() && !itemstack1.getItem().isFood();
}
+ public void spit(ItemStack itemstack) { k(itemstack); } // Purpur - OBFHELPER
private void k(ItemStack itemstack) {
if (!itemstack.isEmpty() && !this.world.isClientSide) {
EntityItem entityitem = new EntityItem(this.world, this.locX + this.getLookDirection().x, this.locY + 1.0D, this.locZ + this.getLookDirection().z, itemstack);
@@ -473,6 +477,7 @@ public class EntityFox extends EntityAnimal {
return this.r(16);
}
+ public void setChasing(boolean flag) { s(flag); } // Purpur - OBFHELPER
public void s(boolean flag) {
this.d(16, flag);
}
@@ -537,6 +542,7 @@ public class EntityFox extends EntityAnimal {
this.setSleeping(false);
}
+ public void stopActions() { en(); } // Purpur - OBFHELPER
private void en() {
this.u(false);
this.setCrouching(false);
@@ -547,7 +553,7 @@ public class EntityFox extends EntityAnimal {
}
private boolean eo() {
- return !this.isSleeping() && !this.isSitting() && !this.dX();
+ return getRider() == null && !this.isSleeping() && !this.isSitting() && !this.dX(); // Purpur
}
@Override
@@ -618,7 +624,30 @@ public class EntityFox extends EntityAnimal {
return deathEvent; // Paper
}
+ // Purpur start
+ @Override
+ public float cW() {
+ return getRider() == null ? super.cW() : 0.5F;
+ }
+
+ @Override
+ public void onMount(EntityHuman entityhuman) {
+ setCanPickupLoot(false);
+ stopActions();
+ setGoalTarget(null);
+ setChasing(false);
+ spit(getEquipment(EnumItemSlot.MAINHAND));
+
+ }
+
+ @Override
+ public void onDismount(EntityHuman entityhuman) {
+ setCanPickupLoot(true);
+ }
+ // Purpur end
+
public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
+ if (entityfox.getRider() != null) return false; // Purpur - cannot jump chase while being ridden
double d0 = entityliving.locZ - entityfox.locZ;
double d1 = entityliving.locX - entityfox.locX;
double d2 = d0 / d1;
@@ -681,16 +710,16 @@ public class EntityFox extends EntityAnimal {
}
}
- public class k extends ControllerLook {
+ public class k extends net.pl3x.purpur.controller.ControllerLookWASD { // Purpur
public k() {
super(EntityFox.this);
}
@Override
- public void a() {
+ public void tick() { // Purpur
if (!EntityFox.this.isSleeping()) {
- super.a();
+ super.tick(); // Purpur
}
}
@@ -1004,12 +1033,12 @@ public class EntityFox extends EntityAnimal {
@Override
public boolean a() {
- return EntityFox.this.getLastDamager() == null && EntityFox.this.getRandom().nextFloat() < 0.02F && !EntityFox.this.isSleeping() && EntityFox.this.getGoalTarget() == null && EntityFox.this.getNavigation().n() && !this.h() && !EntityFox.this.dY() && !EntityFox.this.isCrouching();
+ return getRider() == null && EntityFox.this.getLastDamager() == null && EntityFox.this.getRandom().nextFloat() < 0.02F && !EntityFox.this.isSleeping() && EntityFox.this.getGoalTarget() == null && EntityFox.this.getNavigation().n() && !this.h() && !EntityFox.this.dY() && !EntityFox.this.isCrouching(); // Purpur
}
@Override
public boolean b() {
- return this.f > 0;
+ return getRider() == null && this.f > 0; // Purpur
}
@Override
@@ -1290,8 +1319,14 @@ public class EntityFox extends EntityAnimal {
@Override
public boolean a() {
- return !EntityFox.this.isSitting() && !EntityFox.this.isSleeping() && !EntityFox.this.isCrouching() && !EntityFox.this.dX() && super.a();
+ return getRider() == null && !EntityFox.this.isSitting() && !EntityFox.this.isSleeping() && !EntityFox.this.isCrouching() && !EntityFox.this.dX() && super.a(); // Purpur
+ }
+
+ // Purpur start
+ public boolean b() {
+ return getRider() == null && super.b();
}
+ // Purpur end
}
class u extends PathfinderGoal {
@@ -1349,16 +1384,16 @@ public class EntityFox extends EntityAnimal {
}
}
- class m extends ControllerMove {
+ class m extends net.pl3x.purpur.controller.ControllerMoveWASD { // Purpur
public m() {
super(EntityFox.this);
}
@Override
- public void a() {
+ public void tick() { // Purpur
if (EntityFox.this.eo()) {
- super.a();
+ super.tick(); // Purpur
}
}
diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
index 55b96c4d2..a05c3916f 100644
--- a/src/main/java/net/minecraft/server/EntityGhast.java
@@ -830,7 +1009,7 @@ index 76641682b..bab9431b3 100644
this.bA = new Vec3D[2][4];
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 48ce15484..93dafd038 100644
index 48ce15484..e1560c535 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -9,6 +9,7 @@ import java.util.UUID;
@@ -880,7 +1059,7 @@ index 48ce15484..93dafd038 100644
}
public boolean dH() {
@@ -1355,4 +1361,51 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1355,4 +1361,43 @@ public abstract class EntityInsentient extends EntityLiving {
public boolean a(Item item) {
return this.getItemInMainHand().getItem() == item || this.getItemInOffHand().getItem() == item;
}
@@ -897,7 +1076,7 @@ index 48ce15484..93dafd038 100644
+ if (enumhand != EnumHand.MAIN_HAND) {
+ return false;
+ }
+ if (!entityhuman.isSneaking()) {
+ if (PurpurConfig.requireShiftToMount && !entityhuman.isSneaking()) {
+ return false;
+ }
+ if (!passengers.isEmpty() || entityhuman.isPassenger()) {
@@ -920,15 +1099,7 @@ index 48ce15484..93dafd038 100644
+ entityhuman.mounting = true;
+ entityhuman.yaw = this.yaw;
+ entityhuman.pitch = this.pitch;
+ if (entityhuman.startRiding(this)) {
+ entityhuman.setJumping(false); // fixes jump on mount
+ return true;
+ }
+ return entityhuman.mounting = false;
+ }
+
+ public boolean onSpacebar() {
+ return false;
+ return entityhuman.startRiding(this) || (entityhuman.mounting = false);
+ }
+ // Purpur end
}
@@ -945,7 +1116,7 @@ index bb06d12f6..41ad48c96 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 9ba7a1610..d27728171 100644
index 9ba7a1610..38a0e4978 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 {
@@ -992,7 +1163,15 @@ index 9ba7a1610..d27728171 100644
float f;
if (this.hasEffect(MobEffects.JUMP)) {
@@ -2262,10 +2271,12 @@ public abstract class EntityLiving extends Entity {
@@ -2044,6 +2053,7 @@ public abstract class EntityLiving extends Entity {
Vec3D vec3d = this.getMot();
+ if (getRider() != null) setMot(vec3d.x * 2D, (double) f, vec3d.z * 2D); else // Purpur - add small boost to velocity when jumping while being ridden
this.setMot(vec3d.x, (double) f, vec3d.z);
if (this.isSprinting()) {
float f1 = this.yaw * 0.017453292F;
@@ -2262,10 +2272,12 @@ public abstract class EntityLiving extends Entity {
return this.onGround ? this.da() * (0.21600002F / (f * f * f)) : this.aO;
}
@@ -1005,7 +1184,7 @@ index 9ba7a1610..d27728171 100644
public void o(float f) {
this.bD = f;
}
@@ -2741,6 +2752,7 @@ public abstract class EntityLiving extends Entity {
@@ -2741,6 +2753,7 @@ public abstract class EntityLiving extends Entity {
this.aM = f;
}
@@ -1796,10 +1975,22 @@ index 5cfda3160..ac460de59 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 8f3367ae1..04f398965 100644
index 8f3367ae1..1f8e83110 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -114,4 +114,135 @@ public class PurpurConfig {
@@ -103,6 +103,11 @@ public class PurpurConfig {
return config.getString(path, config.getString(path));
}
+ public static boolean requireShiftToMount = true;
+ private static void requireShiftToMount() {
+ requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
+ }
+
public static int feedMushroomsToCows = 5;
private static void cowsSettings() {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
@@ -114,4 +119,135 @@ 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);
}

41
patches/server/0012-Remove-useless-cooldown-in-Villagers.patch
View File

@@ -1,41 +0,0 @@
From ed7f134dcbacd4a25abb40f60c373b632d95d183 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 10 May 2019 14:34:35 -0500
Subject: [PATCH] Remove useless cooldown in Villagers
---
.../java/net/minecraft/server/EntityVillager.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 6e6f9180c..9d94c1a82 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -187,10 +187,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Override
public void tick() {
super.tick();
- if (this.dV() > 0) {
- this.q(this.dV() - 1);
- }
-
+ // Purpur start - remove useless cooldown
+ //if (this.dV() > 0) {
+ // this.q(this.dV() - 1);
+ //}
+ // Purpur end
}
@Override
@@ -232,7 +233,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
}
private void er() {
- this.q(40);
+ // this.q(40); // Purpur - remove useless cooldown
if (!this.world.e()) {
this.a(SoundEffects.ENTITY_VILLAGER_NO, this.getSoundVolume(), this.cU());
}
--
2.20.1

4
patches/server/0014-Villager-shops.patch → patches/server/0012-Villager-shops.patch
View File

@@ -1,4 +1,4 @@
From 4092f0654e1564971542f82e7c13d7957f762976 Mon Sep 17 00:00:00 2001
From 3b36f995d5ae145ef691c4d1cd2dcb900a7ca302 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 11 May 2019 01:31:50 -0500
Subject: [PATCH] Villager shops
@@ -38,7 +38,7 @@ index 4979f77b7..475c3ec63 100644
return IRegistry.ENTITY_TYPE.get(key);
}
diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
index d78528696..8c75daee2 100644
index f8ef10f90..6f3cee8c1 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
@@ -68,6 +68,7 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP

57
patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch
View File

@@ -1,57 +0,0 @@
From 0bc10c468cdf8d88d2569bd702d5e4827d4ec82e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 10 May 2019 19:17:36 -0500
Subject: [PATCH] Add config to suppress specific log outputs
---
src/main/java/net/minecraft/server/GenericAttributes.java | 1 +
src/main/java/net/minecraft/server/WorldServer.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 7 +++++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
index 908f11f98..20c3b37d3 100644
--- a/src/main/java/net/minecraft/server/GenericAttributes.java
+++ b/src/main/java/net/minecraft/server/GenericAttributes.java
@@ -79,6 +79,7 @@ public class GenericAttributes {
AttributeInstance attributeinstance = attributemapbase.a(nbttagcompound.getString("Name"));
if (attributeinstance == null) {
+ if (net.pl3x.purpur.PurpurConfig.showUnknownAttributeWarnings) // Purpur
GenericAttributes.LOGGER.warn("Ignoring unknown attribute '{}'", nbttagcompound.getString("Name"));
} else {
a(attributeinstance, nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 3ed12672e..d82102bd8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -985,7 +985,7 @@ public class WorldServer extends World {
return false;
}
- if (DEBUG_ENTITIES && entity.world.paperConfig.duplicateUUIDMode != PaperWorldConfig.DuplicateUUIDMode.NOTHING) {
+ if (net.pl3x.purpur.PurpurConfig.showDuplicateEntityUUIDErrors && DEBUG_ENTITIES && entity.world.paperConfig.duplicateUUIDMode != PaperWorldConfig.DuplicateUUIDMode.NOTHING) { // Purpur
WorldServer.LOGGER.error("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit // paper
WorldServer.LOGGER.error("Deleting duplicate entity {}", entity); // CraftBukkit // paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 8f3367ae1..d552076b3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -103,6 +103,13 @@ public class PurpurConfig {
return config.getString(path, config.getString(path));
}
+ public static boolean showDuplicateEntityUUIDErrors = true;
+ public static boolean showUnknownAttributeWarnings = true;
+ private static void loggerSettings() {
+ showDuplicateEntityUUIDErrors = getBoolean("settings.logger.show-duplicate-entity-uuid-errors", showDuplicateEntityUUIDErrors);
+ showUnknownAttributeWarnings = getBoolean("settings.logger.show-unknown-attribute-warnings", showUnknownAttributeWarnings);
+ }
+
public static int feedMushroomsToCows = 5;
private static void cowsSettings() {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
--
2.20.1

6
patches/server/0015-Make-giants-naturally-spawn-and-have-AI.patch → patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch
View File

@@ -1,4 +1,4 @@
From 6e6fe490ddc8c6801032601d94e589d9605b3aaa Mon Sep 17 00:00:00 2001
From 56ee0afc64f085c3555035967353013e12274f51 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Make giants naturally spawn and have AI
@@ -106,10 +106,10 @@ index b7e2022b1..d618c23ef 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6eedf2c40..02f28e5ee 100644
index 1f8e83110..38f9d3a3a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -115,6 +115,13 @@ public class PurpurConfig {
@@ -113,6 +113,13 @@ public class PurpurConfig {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
}

2
patches/server/0016-Pigs-give-saddle-back.patch → patches/server/0014-Pigs-give-saddle-back.patch
View File

@@ -1,4 +1,4 @@
From e8384e7172b361a68945e8ffe04dc78e03c6f17f Mon Sep 17 00:00:00 2001
From 0dfdfd6131c8ce51cb3d7ca41ec3069c77b3ad10 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 01:14:46 -0500
Subject: [PATCH] Pigs give saddle back

2
patches/server/0017-Prevent-phantoms-spawning-on-creative-players.patch → patches/server/0015-Prevent-phantoms-spawning-on-creative-players.patch
View File

@@ -1,4 +1,4 @@
From bae208ea787e6f17f41f80ffa6a03ba15b860708 Mon Sep 17 00:00:00 2001
From 9c2df3b4649299072058da918e2b88a57175f819 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 18 May 2019 16:59:52 -0500
Subject: [PATCH] Prevent phantoms spawning on creative players

6
patches/server/0018-Add-regen-effect-to-campfires.patch → patches/server/0016-Add-regen-effect-to-campfires.patch
View File

@@ -1,4 +1,4 @@
From 9de87bb1107c394fabaf8a7e9d2b2fcbdb8ad7ac Mon Sep 17 00:00:00 2001
From 74feb86c1e53deca4d2904bc49702263b5095f2d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 19 May 2019 18:11:53 -0500
Subject: [PATCH] Add regen effect to campfires
@@ -11,10 +11,10 @@ Subject: [PATCH] Add regen effect to campfires
4 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index d27728171..85d41714d 100644
index 38a0e4978..b1372c71d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2712,10 +2712,19 @@ public abstract class EntityLiving extends Entity {
@@ -2713,10 +2713,19 @@ public abstract class EntityLiving extends Entity {
}
public boolean hasLineOfSight(Entity entity) {

10
patches/server/0019-Tick-loop-config-options.patch → patches/server/0017-Tick-loop-config-options.patch
View File

@@ -1,4 +1,4 @@
From 5ee60b89523ad52f1d3be24ce37cfc66e4491faf Mon Sep 17 00:00:00 2001
From 6c03ff30509c579923792c2f7a114a1dc9bffe7a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 22 May 2019 22:30:08 -0500
Subject: [PATCH] Tick loop config options
@@ -59,7 +59,7 @@ index 5bd0a4cc7..67caf83e7 100644
this.methodProfiler.exit();
this.methodProfiler.b();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d7236ebd6..a23f5d798 100644
index 38f9d3a3a..99b7abd6d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -103,6 +103,13 @@ public class PurpurConfig {
@@ -73,9 +73,9 @@ index d7236ebd6..a23f5d798 100644
+ enableTPSCatchup = getBoolean("settings.enable-tps-catchup", enableTPSCatchup);
+ }
+
public static boolean showDuplicateEntityUUIDErrors = true;
public static boolean showUnknownAttributeWarnings = true;
private static void loggerSettings() {
public static boolean requireShiftToMount = true;
private static void requireShiftToMount() {
requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
--
2.20.1

6
patches/server/0020-Campfires-should-fall-with-gravity.patch → patches/server/0018-Campfires-should-fall-with-gravity.patch
View File

@@ -1,4 +1,4 @@
From 5a2392efe7030ebb3b440b35bfacd312b16f16dd Mon Sep 17 00:00:00 2001
From efdbf6479d70b20959933d43eae954e9d1d2b9c9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 16:20:21 -0500
Subject: [PATCH] Campfires should fall with gravity
@@ -9,7 +9,7 @@ Subject: [PATCH] Campfires should fall with gravity
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index e77fed937..3eb7edd6e 100644
index 5cbe8e68e..904bf47b8 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -72,8 +72,26 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -49,7 +49,7 @@ index e77fed937..3eb7edd6e 100644
if (flag) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index becb6f3b7..e598099dd 100644
index 5e9c633ac..6e6d6defd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -61,6 +61,11 @@ public class PurpurWorldConfig {

6
patches/server/0021-Packed-Barrels.patch → patches/server/0019-Packed-Barrels.patch
View File

@@ -1,4 +1,4 @@
From dbbaaaaa830f331707165d487bd1da9ce73940bb Mon Sep 17 00:00:00 2001
From 573ce3778d45ecc00e8819789636f22713f9a29a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Packed Barrels
@@ -39,10 +39,10 @@ index 4c71d8e1d..045bf3b6b 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4c20a6f70..6889dcdde 100644
index 99b7abd6d..95f754bfb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -136,6 +136,11 @@ public class PurpurConfig {
@@ -134,6 +134,11 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}

4
patches/server/0022-Right-click-to-open-sign-editor.patch → patches/server/0020-Right-click-to-open-sign-editor.patch
View File

@@ -1,4 +1,4 @@
From fe717237720589ce53c2584f68295a06da571d5a Mon Sep 17 00:00:00 2001
From e1cb4d184b4548f4895327d7cb1ce9aef6904eaf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 24 May 2019 02:39:25 -0500
Subject: [PATCH] Right click to open sign editor
@@ -30,7 +30,7 @@ index b6d7689d5..746709025 100644
} else {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e598099dd..b0d7c6bd2 100644
index 6e6d6defd..7f996591f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -61,6 +61,11 @@ public class PurpurWorldConfig {

4
patches/server/0023-Bring-back-server-name.patch → patches/server/0021-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From d0f5d2cd76bb6b109e08446c937eac7c60b51c19 Mon Sep 17 00:00:00 2001
From 3d321157c33e04aefc2894812e25f9f59018a357 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:19:14 -0500
Subject: [PATCH] Bring back server name
@@ -21,7 +21,7 @@ index fb092a941..54c0b4247 100644
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b04abedb2..338acf098 100644
index 99004792e..43c26e7fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2149,4 +2149,11 @@ public final class CraftServer implements Server {

2
patches/server/0024-Add-village-raid-spawn-reason.patch → patches/server/0022-Add-village-raid-spawn-reason.patch
View File

@@ -1,4 +1,4 @@
From 3950cb7d0630fe42b19a6873461f2e944de97075 Mon Sep 17 00:00:00 2001
From 4adfecc557917b0a5a882974f098d6f5fc635c05 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 29 May 2019 23:39:04 -0500
Subject: [PATCH] Add village raid spawn reason

2
patches/server/0025-Advancement-API-Additions.patch → patches/server/0023-Advancement-API-Additions.patch
View File

@@ -1,4 +1,4 @@
From cd22f7d586a7e9e4f86be9b3c4c2148584ba32a8 Mon Sep 17 00:00:00 2001
From c65db504cbfde1595c4665f0118f9362ec5a2bb9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 31 May 2019 21:24:33 -0500
Subject: [PATCH] Advancement API Additions

6
patches/server/0026-Always-place-dragon-egg-when-dragon-is-killed.patch → patches/server/0024-Always-place-dragon-egg-when-dragon-is-killed.patch
View File

@@ -1,4 +1,4 @@
From 9efc6b7d1792352c08101e95449d603fb260a3da Mon Sep 17 00:00:00 2001
From 55edf4be8c6548241d2a05810676c19f4bd00ddc Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 1 Jun 2019 01:16:35 -0500
Subject: [PATCH] Always place dragon egg when dragon is killed
@@ -31,10 +31,10 @@ index 6700c8c65..f0c77eb6c 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6889dcdde..1c1a63144 100644
index 95f754bfb..65a7b6e8b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -141,6 +141,11 @@ public class PurpurConfig {
@@ -139,6 +139,11 @@ public class PurpurConfig {
packedBarrels = getBoolean("settings.packed-barrels", packedBarrels);
}

2
patches/server/0027-Dont-spaz-out-startup-on-custom-world-generators.patch → patches/server/0025-Dont-spaz-out-startup-on-custom-world-generators.patch
View File

@@ -1,4 +1,4 @@
From 644d86fd8954a09a28fe522d88d4dc14a719405d Mon Sep 17 00:00:00 2001
From 7cf0027f0c5e4babd9f158bb9105c7fd60537516 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 2 Jun 2019 02:36:59 -0500
Subject: [PATCH] Dont spaz out startup on custom world generators

2
patches/server/0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch → patches/server/0026-Fix-outdated-server-showing-in-ping-before-server-fu.patch
View File

@@ -1,4 +1,4 @@
From 8e1a4de857a44fc38043bdc6bec939bffb9c0793 Mon Sep 17 00:00:00 2001
From a983b87623aad0c3acfad70d1257f66677c7de4a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 4 Jun 2019 15:50:08 -0500
Subject: [PATCH] Fix 'outdated server' showing in ping before server fully

2
patches/server/0029-Allow-color-codes-on-signs.patch → patches/server/0027-Allow-color-codes-on-signs.patch
View File

@@ -1,4 +1,4 @@
From ee84ee7aa0c3670cd35b96bfb4d27b1b17c6ea04 Mon Sep 17 00:00:00 2001
From 495bcb3abea3347dae4408813613855caee49623 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Allow color codes on signs

2
patches/server/0030-Campfires-burn-out-in-rain.patch → patches/server/0028-Campfires-burn-out-in-rain.patch
View File

@@ -1,4 +1,4 @@
From 688f5111c13d50d317adb0667e0d9cff7f6ebaff Mon Sep 17 00:00:00 2001
From c9975466f043da8dc4f0e1c0a7ba4db7dbd352ef Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 21:30:49 -0500
Subject: [PATCH] Campfires burn out in rain

2
patches/server/0031-Add-config-for-items-breaking-turtle-eggs.patch → patches/server/0029-Add-config-for-items-breaking-turtle-eggs.patch
View File

@@ -1,4 +1,4 @@
From fd5cde0c918895459900c386cf96a6bcfa922d86 Mon Sep 17 00:00:00 2001
From 86ab92142299a1e2412d3aeebea99d4cabac9508 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] Add config for items breaking turtle eggs

4
patches/server/0032-Block-and-Fluid-Tick-Events.patch → patches/server/0030-Block-and-Fluid-Tick-Events.patch
View File

@@ -1,4 +1,4 @@
From 1533472cf35569ae6063e2c5734d0cf5cf150a73 Mon Sep 17 00:00:00 2001
From 215b5058ec04eb3901fa9edb3470c5febbe4216c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 23:23:52 -0500
Subject: [PATCH] Block and Fluid Tick Events
@@ -10,7 +10,7 @@ Subject: [PATCH] Block and Fluid Tick Events
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 4f5fdc4ae..194be9ef1 100644
index 92aad060e..01b77528e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -446,13 +446,13 @@ public class WorldServer extends World {