OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix skeleton horse spawn chance ignoring difficulty modifier if custom set

Browse source 
Also reduce diff
This commit is contained in:
Aikar 2016-05-30 12:50:57 -04:00
parent 44857e00e2
commit a9ec7b3a75
6 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Spigot-Server-Patches/Add-ability-to-configure-frosted_ice-properties.patch
View file

@ -43,6 +43,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
} }
-- --
2.7.4 (Apple Git-66)

8
Spigot-Server-Patches/Configurable-spawn-chances-for-skeleton-horses.patch
View file

@ -16,6 +16,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public double skeleHorseSpawnChance; + public double skeleHorseSpawnChance;
+ private void skeleHorseSpawnChance() { + private void skeleHorseSpawnChance() {
+ skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", -1.0D); // -1.0D represents a "vanilla" state + skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", -1.0D); // -1.0D represents a "vanilla" state
+ if (skeleHorseSpawnChance < 0) {
+ skeleHorseSpawnChance = 0.05D; // Vanilla
+ }
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
@ -27,10 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
DifficultyDamageScaler difficultydamagescaler = this.D(blockposition); DifficultyDamageScaler difficultydamagescaler = this.D(blockposition);
- if (this.random.nextDouble() < (double) difficultydamagescaler.b() * 0.05D) { - if (this.random.nextDouble() < (double) difficultydamagescaler.b() * 0.05D) {
+ // Paper start - Configurable skeleton horse spawn chance + if (this.random.nextDouble() < difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance) { // Paper - Configurable skeleton horse spawn chance
+ double chance = this.paperConfig.skeleHorseSpawnChance == -1.0D ? (double) difficultydamagescaler.b() * 0.05D : this.paperConfig.skeleHorseSpawnChance;
+ if (this.random.nextDouble() < chance) {
+ // Paper end
EntityHorse entityhorse = new EntityHorse(this); EntityHorse entityhorse = new EntityHorse(this);
entityhorse.setType(EnumHorseType.SKELETON); entityhorse.setType(EnumHorseType.SKELETON);

4
Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch
View file

@ -728,6 +728,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private final CraftInventory inventory; private final CraftInventory inventory;
CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
-- --
2.7.4 (Apple Git-66)

4
Spigot-Server-Patches/Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
View file

@ -15,8 +15,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig { @@ -0,0 +0,0 @@ public class PaperWorldConfig {
private void skeleHorseSpawnChance() { skeleHorseSpawnChance = 0.05D; // Vanilla
skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", -1.0D); // -1.0D represents a "vanilla" state }
} }
+ +
+ public boolean firePhysicsEventForRedstone = false; + public boolean firePhysicsEventForRedstone = false;

4
Spigot-Server-Patches/Optional-old-TNT-cannon-behaviors.patch
View file

@ -390,6 +390,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (entity instanceof EntityHuman) { if (entity instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) entity; EntityHuman entityhuman = (EntityHuman) entity;
-- --
2.7.4 (Apple Git-66)

4
Spigot-Server-Patches/Re-add-tileEntityTick.startTiming-Spigot-removed.patch
View file

@ -16,6 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.M = true; this.M = true;
// CraftBukkit start - From below, clean up tile entities before ticking them // CraftBukkit start - From below, clean up tile entities before ticking them
if (!this.tileEntityListUnload.isEmpty()) { if (!this.tileEntityListUnload.isEmpty()) {
-- --
2.7.4 (Apple Git-66)