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

Start using lang asset for commands

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-26 14:29:04 -05:00
parent c0a4d03625
commit faf5e485c4
4 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0004-decompile-fixes.patch
View File

@@ -1,4 +1,4 @@
From 1d85f4fa73d52df3f718927ced620dbad1505d9b Mon Sep 17 00:00:00 2001
From 1b3d78effb6b59d0cfee3c0085b6aca862b520c7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 27 Feb 2020 13:39:06 -0600
Subject: [PATCH] decompile-fixes
@@ -78,6 +78,7 @@ Subject: [PATCH] decompile-fixes
.../java/net/minecraft/server/BiomeVoid.java | 2 +-
.../minecraft/server/BiomeWarmDeepOcean.java | 8 +++---
.../net/minecraft/server/BiomeWarmOcean.java | 10 +++----
.../net/minecraft/server/ChatMessage.java | 2 +-
.../net/minecraft/server/CommandDebug.java | 2 +-
.../net/minecraft/server/EntityBlaze.java | 2 +-
.../java/net/minecraft/server/EntityCat.java | 2 +-
@@ -90,7 +91,7 @@ Subject: [PATCH] decompile-fixes
.../net/minecraft/server/EntityWitch.java | 4 +--
.../java/net/minecraft/server/MathHelper.java | 2 +-
.../server/WorldGenFeatureConfigured.java | 2 +-
86 files changed, 225 insertions(+), 231 deletions(-)
87 files changed, 226 insertions(+), 232 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
index de831ed87e..9c38f8907a 100644
@@ -1406,6 +1407,19 @@ index dd7916c090..e4dc7d198c 100644
BiomeDecoratorGroups.ap(this);
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 10, 4, 4));
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.PUFFERFISH, 15, 1, 3));
diff --git a/src/main/java/net/minecraft/server/ChatMessage.java b/src/main/java/net/minecraft/server/ChatMessage.java
index afd299441f..937361fc2b 100644
--- a/src/main/java/net/minecraft/server/ChatMessage.java
+++ b/src/main/java/net/minecraft/server/ChatMessage.java
@@ -171,7 +171,7 @@ public class ChatMessage extends ChatBaseComponent implements ChatComponentConte
@Override
public Stream<IChatBaseComponent> c() {
this.i();
- return Streams.concat(new Stream[]{this.b.stream(), this.siblings.stream()}).flatMap(IChatBaseComponent::c);
+ return Streams.concat(this.b.stream(), this.siblings.stream()).flatMap(IChatBaseComponent::c); // Purpur decompile error
}
@Override
diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
index d384e9578a..f0d72ea39d 100644
--- a/src/main/java/net/minecraft/server/CommandDebug.java