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

[SPIGOT-946] Begin making use of access transforms to simplify patching.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2015-06-06 19:33:48 +10:00
parent ae714e4861
commit 58abe21c5a
47 changed files with 76 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
paper-server/nms-patches/EntityLiving.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityLiving.java
+++ b/net/minecraft/server/EntityLiving.java
@@ -10,13 +10,26 @@
@@ -10,12 +10,25 @@
import java.util.Random;
import java.util.UUID;
@@ -22,43 +22,12 @@
private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
private static final AttributeModifier b = (new AttributeModifier(EntityLiving.a, "Sprinting speed boost", 0.30000001192092896D, 2)).a(false);
private AttributeMapBase c;
- private final CombatTracker combatTracker = new CombatTracker(this);
- private final Map<Integer, MobEffect> effects = Maps.newHashMap();
+ public CombatTracker combatTracker = new CombatTracker(this); // CraftBukkit - public
+ public final Map<Integer, MobEffect> effects = Maps.newHashMap(); // CraftBukkit - public
- public final CombatTracker combatTracker = new CombatTracker(this);
+ public CombatTracker combatTracker = new CombatTracker(this);
public final Map<Integer, MobEffect> effects = Maps.newHashMap();
private final ItemStack[] h = new ItemStack[5];
public boolean ar;
public int as;
@@ -40,7 +53,7 @@
public float aK;
public float aL;
public float aM = 0.02F;
- protected EntityHuman killer;
+ public EntityHuman killer;
protected int lastDamageByPlayerTime;
protected boolean aP;
protected int ticksFarFromPlayer;
@@ -50,7 +63,7 @@
protected float aU;
protected float aV;
protected int aW;
- protected float lastDamage;
+ public float lastDamage; // CraftBukkit - public
protected boolean aY;
public float aZ;
public float ba;
@@ -61,14 +74,19 @@
protected double bf;
protected double bg;
protected double bh;
- private boolean updateEffects = true;
- private EntityLiving lastDamager;
- private int hurtTimestamp;
+ public boolean updateEffects = true; // CraftBukkit - public
+ public EntityLiving lastDamager; // CraftBukkit - public
+ public int hurtTimestamp; // CraftBukkit - public
private EntityLiving bk;
private int bl;
@@ -69,6 +82,11 @@
private float bm;
private int bn;
private float bo;