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

Merge patch from last commit the right way

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-17 02:52:37 -06:00
parent 97e1a38a6e
commit 04686a66b8
4 changed files with 225 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0057-Add-killer-rabbit-natural-spawn-chance.patch
View File

@@ -1,4 +1,4 @@
From 90280796ba7cf39404b3a8432fc6d17f708dbaa6 Mon Sep 17 00:00:00 2001
From ac76a88f329371e598863969a945bb0a788dc423 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 31 Aug 2019 17:24:41 -0500
Subject: [PATCH] Add killer rabbit natural spawn chance
@@ -9,10 +9,10 @@ Subject: [PATCH] Add killer rabbit natural spawn chance
2 files changed, 7 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
index d36a074c89..c8de748664 100644
index 0eae51aa6..d2f5e4e0f 100644
--- a/src/main/java/net/minecraft/server/EntityRabbit.java
+++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -321,6 +321,8 @@ public class EntityRabbit extends EntityAnimal {
@@ -369,6 +369,8 @@ public class EntityRabbit extends EntityAnimal {
}
private int a(GeneratorAccess generatoraccess) {
@@ -22,7 +22,7 @@ index d36a074c89..c8de748664 100644
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index a511c83cca..1b1e4ca25b 100644
index a511c83cc..1b1e4ca25 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -219,6 +219,11 @@ public class PurpurConfig {