3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 20:40:08 +01:00

Rebuild some patches

Dieser Commit ist enthalten in:
Zach Brown 2016-03-12 00:40:16 -06:00
Ursprung 386693ee50
Commit 244196f8cb
2 geänderte Dateien mit 7 neuen und 19 gelöschten Zeilen

Datei anzeigen

@ -1,4 +1,4 @@
From 72795f24992711b90de1db3fa337de1ffbbe06d8 Mon Sep 17 00:00:00 2001 From 7e35c9c03a1fe023e8da7de1718f60e00298c6b5 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 13:20:33 -0700 Date: Thu, 3 Mar 2016 13:20:33 -0700
Subject: [PATCH] Use ASM for event executors. Subject: [PATCH] Use ASM for event executors.
@ -349,3 +349,4 @@ index 93a43dd..7229b25 100644
} else { } else {
-- --
2.7.2 2.7.2

Datei anzeigen

@ -1,22 +1,9 @@
From e517ad6d7b004bfea02ba11c3e32ff28ba42acdc Mon Sep 17 00:00:00 2001 From f4793135ffe14e9f962bd15dc4f60ce61eb2aca3 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 23:30:53 -0600 Date: Wed, 2 Mar 2016 23:30:53 -0600
Subject: [PATCH] Add BeaconEffectEvent Subject: [PATCH] Add BeaconEffectEvent
diff --git a/src/main/java/net/minecraft/server/MobEffectList.java b/src/main/java/net/minecraft/server/MobEffectList.java
index 24ae8e2..a5cbda5 100644
--- a/src/main/java/net/minecraft/server/MobEffectList.java
+++ b/src/main/java/net/minecraft/server/MobEffectList.java
@@ -17,7 +17,7 @@ public class MobEffectList {
private final Map<IAttribute, AttributeModifier> a = Maps.newHashMap();
private final boolean c;
private final int d;
- private String e = "";
+ public String e = ""; // Paper - private -> public
private int f = -1;
public double durationModifier;
private boolean h;
diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
index ed5b374..f490dca 100644 index ed5b374..f490dca 100644
--- a/src/main/java/net/minecraft/server/TileEntityBeacon.java --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java