SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve death events (#1362)

Browse Source 
* Improve death events

This adds the ability to cancel the events and to specify the sound.
This commit is contained in:
Max Lee
2018-09-08 02:14:48 +02:00
parent 4e4a4dbf5e
commit 4ff931a021
4 changed files with 603 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-Server-Patches/MC-Dev-fixes.patch
View File

@@ -110,19 +110,19 @@ index a540167d6..b2860555d 100644
return this.a(jsonelement, type, jsondeserializationcontext);
}
}
diff --git a/src/main/java/net/minecraft/server/Registry.java b/src/main/java/net/minecraft/server/Registry.java
index 723372f26..c38c3768c 100644
--- a/src/main/java/net/minecraft/server/Registry.java
+++ b/src/main/java/net/minecraft/server/Registry.java
@@ -0,0 +0,0 @@
package net.minecraft.server;
-public interface Registry extends Iterable {}
+public interface Registry<T> extends Iterable<T> {} // Paper - decompile fix
diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
index 58f47d0de..8860a0129 100644
index 58f47d0de..03894df54 100644
--- a/src/main/java/net/minecraft/server/RegistryBlockID.java
+++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
@@ -0,0 +0,0 @@ import java.util.Iterator;
import java.util.List;
import javax.annotation.Nullable;
-public class RegistryBlockID<T> implements Registry<T> {
+public class RegistryBlockID<T> implements Registry { // Paper - Fix decompile error
private final IdentityHashMap<T, Integer> a;
private final List<T> b;
@@ -0,0 +0,0 @@ public class RegistryBlockID<T> implements Registry<T> {
this.a.put(t0, Integer.valueOf(i));