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

Add config options for ridable mobs

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-30 20:03:32 -05:00
parent 9b92a657d9
commit 40457968fb
6 changed files with 1138 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/api/0006-Integrate-ridables.patch
View File

@@ -1,11 +1,12 @@
From 71371455d2847adc6228a22c726a3fe05cfe68f0 Mon Sep 17 00:00:00 2001 From 4926faa24f641cd5c916e86736812ab54e2ab2b8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 06:08:35 -0500 Date: Fri, 3 May 2019 06:08:35 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
--- ---
src/main/java/org/bukkit/entity/LivingEntity.java | 14 ++++++++++++++ .../java/org/bukkit/entity/LivingEntity.java | 14 ++++++++++++++
1 file changed, 14 insertions(+) src/main/java/org/bukkit/entity/Mob.java | 16 ++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index f47a6869..3a896185 100644 index f47a6869..3a896185 100644
@@ -31,6 +32,31 @@ index f47a6869..3a896185 100644
+ void setCanBeRiddenInWater(boolean canBeRiddenInWater); + void setCanBeRiddenInWater(boolean canBeRiddenInWater);
// Purpur end // Purpur end
} }
diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
index 784db447..b3a9c1a4 100644
--- a/src/main/java/org/bukkit/entity/Mob.java
+++ b/src/main/java/org/bukkit/entity/Mob.java
@@ -42,4 +42,20 @@ public interface Mob extends LivingEntity, Lootable {
*/
@Nullable
public LivingEntity getTarget();
+
+ // Purpur start
+ /**
+ * Get if this mob is ridable
+ *
+ * @return True if ridable
+ */
+ boolean isRidable();
+
+ /**
+ * Set if this mob is ridable
+ *
+ * @param ridable True to make ridable
+ */
+ void setRidable(boolean ridable);
+ // Purpur end
}
-- --
2.20.1 2.20.1

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

File diff suppressed because it is too large Load Diff

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

@@ -1,4 +1,4 @@
From f9785380f7c40f676ef7415b84a70c4bcb546f04 Mon Sep 17 00:00:00 2001 From ed7f134dcbacd4a25abb40f60c373b632d95d183 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 10 May 2019 14:34:35 -0500 Date: Fri, 10 May 2019 14:34:35 -0500
Subject: [PATCH] Remove useless cooldown in Villagers Subject: [PATCH] Remove useless cooldown in Villagers
@@ -8,10 +8,10 @@ Subject: [PATCH] Remove useless cooldown in Villagers
1 file changed, 6 insertions(+), 5 deletions(-) 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 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index f2b46d4e3..72701ef4a 100644 index 6e6f9180c..9d94c1a82 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java --- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -186,10 +186,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -187,10 +187,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Override @Override
public void tick() { public void tick() {
super.tick(); super.tick();
@@ -27,7 +27,7 @@ index f2b46d4e3..72701ef4a 100644
} }
@Override @Override
@@ -231,7 +232,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -232,7 +233,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
} }
private void er() { private void er() {

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

@@ -1,4 +1,4 @@
From 482e52d5f3fd6ae5a8c4088174176d5a02a46da1 Mon Sep 17 00:00:00 2001 From 6e6fe490ddc8c6801032601d94e589d9605b3aaa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500 Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Make giants naturally spawn and have AI Subject: [PATCH] Make giants naturally spawn and have AI
@@ -11,7 +11,7 @@ Subject: [PATCH] Make giants naturally spawn and have AI
4 files changed, 62 insertions(+), 1 deletion(-) 4 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
index 72eb669c50..f1500f7a0e 100644 index 72eb669c5..f1500f7a0 100644
--- a/src/main/java/net/minecraft/server/BiomeBase.java --- a/src/main/java/net/minecraft/server/BiomeBase.java
+++ b/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java
@@ -97,6 +97,7 @@ public abstract class BiomeBase { @@ -97,6 +97,7 @@ public abstract class BiomeBase {
@@ -23,7 +23,7 @@ index 72eb669c50..f1500f7a0e 100644
((List) this.u.get(enumcreaturetype)).add(biomebase_biomemeta); ((List) this.u.get(enumcreaturetype)).add(biomebase_biomemeta);
} }
diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
index f4698a6809..3f7f7a2de8 100644 index f4698a680..3f7f7a2de 100644
--- a/src/main/java/net/minecraft/server/Biomes.java --- a/src/main/java/net/minecraft/server/Biomes.java
+++ b/src/main/java/net/minecraft/server/Biomes.java +++ b/src/main/java/net/minecraft/server/Biomes.java
@@ -92,5 +92,30 @@ public abstract class Biomes { @@ -92,5 +92,30 @@ public abstract class Biomes {
@@ -58,7 +58,7 @@ index f4698a6809..3f7f7a2de8 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index 19b8312f26..b58b681a92 100644 index b7e2022b1..d618c23ef 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
@@ -69,7 +69,7 @@ index 19b8312f26..b58b681a92 100644
public class EntityGiantZombie extends EntityMonster { public class EntityGiantZombie extends EntityMonster {
public EntityGiantZombie(EntityTypes<? extends EntityGiantZombie> entitytypes, World world) { public EntityGiantZombie(EntityTypes<? extends EntityGiantZombie> entitytypes, World world) {
@@ -23,8 +25,34 @@ public class EntityGiantZombie extends EntityMonster { @@ -24,8 +26,34 @@ public class EntityGiantZombie extends EntityMonster {
this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(50.0D); this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(50.0D);
} }
@@ -106,7 +106,7 @@ index 19b8312f26..b58b681a92 100644
} }
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d552076b31..d7236ebd6c 100644 index 6eedf2c40..02f28e5ee 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -115,6 +115,13 @@ public class PurpurConfig { @@ -115,6 +115,13 @@ public class PurpurConfig {

6
patches/server/0016-Pigs-give-saddle-back.patch
View File

@@ -1,4 +1,4 @@
From 95c80f781546d30bbf63b8135e18e1a23933a3d8 Mon Sep 17 00:00:00 2001 From e8384e7172b361a68945e8ffe04dc78e03c6f17f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 01:14:46 -0500 Date: Sun, 12 May 2019 01:14:46 -0500
Subject: [PATCH] Pigs give saddle back Subject: [PATCH] Pigs give saddle back
@@ -8,10 +8,10 @@ Subject: [PATCH] Pigs give saddle back
1 file changed, 11 insertions(+), 1 deletion(-) 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index e51054b23..2b078211d 100644 index fd57e5bde..e1e43cebf 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java --- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -118,10 +118,20 @@ public class EntityPig extends EntityAnimal { @@ -119,10 +119,20 @@ public class EntityPig extends EntityAnimal {
return true; return true;
} }
if (hasSaddle() && !isVehicle()) { if (hasSaddle() && !isVehicle()) {

16
patches/server/0021-Packed-Barrels.patch
View File

@@ -1,4 +1,4 @@
From 2c7d33706f295b38b1f85df0e1e7bd2136df269b Mon Sep 17 00:00:00 2001 From dbbaaaaa830f331707165d487bd1da9ce73940bb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 21:50:37 -0500 Date: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Packed Barrels Subject: [PATCH] Packed Barrels
@@ -9,7 +9,7 @@ Subject: [PATCH] Packed Barrels
2 files changed, 8 insertions(+), 2 deletions(-) 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
index a4a5150ff..007d0cda5 100644 index 4c71d8e1d..045bf3b6b 100644
--- a/src/main/java/net/minecraft/server/TileEntityBarrel.java --- a/src/main/java/net/minecraft/server/TileEntityBarrel.java
+++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java +++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java
@@ -56,7 +56,7 @@ public class TileEntityBarrel extends TileEntityLootable { @@ -56,7 +56,7 @@ public class TileEntityBarrel extends TileEntityLootable {
@@ -39,19 +39,21 @@ index a4a5150ff..007d0cda5 100644
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index a23f5d798..2f7d099ba 100644 index 4c20a6f70..6889dcdde 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -135,4 +135,9 @@ public class PurpurConfig { @@ -136,6 +136,11 @@ 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); snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
} }
+
+ public static boolean packedBarrels = true; + public static boolean packedBarrels = true;
+ private static void packedBarrels() { + private static void packedBarrels() {
+ packedBarrels = getBoolean("settings.packed-barrels", packedBarrels); + packedBarrels = getBoolean("settings.packed-barrels", packedBarrels);
+ } + }
} +
public static boolean ridableBat = true;
public static boolean ridableBlaze = true;
public static boolean ridableCat = true;
-- --
2.20.1 2.20.1