Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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

10
patches/server/0058-Add-option-to-spawn-Toast.patch
View File

@@ -1,4 +1,4 @@
From 705a01f181413de4d7805c15bc2610f9dd928c67 Mon Sep 17 00:00:00 2001
From 812ac4fe483e705caa989aa9f6effa20240b8d45 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 31 Aug 2019 17:47:11 -0500
Subject: [PATCH] Add option to spawn Toast
@@ -9,10 +9,10 @@ Subject: [PATCH] Add option to spawn Toast
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
index c8de748664..35b8e182c6 100644
index d2f5e4e0f..2e89745ce 100644
--- a/src/main/java/net/minecraft/server/EntityRabbit.java
+++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -300,7 +300,7 @@ public class EntityRabbit extends EntityAnimal {
@@ -348,7 +348,7 @@ public class EntityRabbit extends EntityAnimal {
if (!this.hasCustomName()) {
this.setCustomName(new ChatMessage(SystemUtils.a("entity", EntityRabbit.bx), new Object[0]));
}
@@ -21,7 +21,7 @@ index c8de748664..35b8e182c6 100644
this.datawatcher.set(EntityRabbit.bw, i);
}
@@ -322,6 +322,7 @@ public class EntityRabbit extends EntityAnimal {
@@ -370,6 +370,7 @@ public class EntityRabbit extends EntityAnimal {
private int a(GeneratorAccess generatoraccess) {
if (net.pl3x.purpur.PurpurConfig.killerRabbitChance > 0D && net.pl3x.purpur.PurpurConfig.killerRabbitChance > random.nextDouble()) return 99; // Purpur
@@ -30,7 +30,7 @@ index c8de748664..35b8e182c6 100644
BiomeBase biomebase = generatoraccess.getBiome(new BlockPosition(this));
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 1b1e4ca25b..0537d06811 100644
index 1b1e4ca25..0537d0681 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -220,8 +220,10 @@ public class PurpurConfig {