twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-17 21:33:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.12-pre2

Browse Source
This commit is contained in:
md_5
2017-05-14 12:00:00 +10:00
parent 6e3cec8bc7
commit 5195487ec6
210 changed files with 2280 additions and 1974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
nms-patches/EntityShulker.patch
View File

@@ -11,33 +11,6 @@
public class EntityShulker extends EntityGolem implements IMonster {
@@ -14,7 +18,7 @@
protected static final DataWatcherObject<EnumDirection> a = DataWatcher.a(EntityShulker.class, DataWatcherRegistry.l);
protected static final DataWatcherObject<Optional<BlockPosition>> b = DataWatcher.a(EntityShulker.class, DataWatcherRegistry.k);
protected static final DataWatcherObject<Byte> c = DataWatcher.a(EntityShulker.class, DataWatcherRegistry.a);
- protected static final DataWatcherObject<Byte> bw = DataWatcher.a(EntityShulker.class, DataWatcherRegistry.a);
+ public static final DataWatcherObject<Byte> bw = DataWatcher.a(EntityShulker.class, DataWatcherRegistry.a); // PAIL: protected -> public, rename COLOR
public static final EnumColor bx = EnumColor.PURPLE;
private float bA;
private float bB;
@@ -65,7 +69,7 @@
}
public void D() {
- if (!this.do()) {
+ if (!this.do_()) {
super.D();
}
@@ -76,7 +80,7 @@
}
protected SoundEffect bW() {
- return this.do() ? SoundEffects.fH : SoundEffects.fG;
+ return this.do_() ? SoundEffects.fH : SoundEffects.fG;
}
protected void i() {
@@ -112,7 +116,7 @@
this.datawatcher.set(EntityShulker.b, Optional.of(new BlockPosition(i, j, k)));
@@ -67,21 +40,3 @@
break;
}
}
@@ -390,7 +403,7 @@
}
public boolean damageEntity(DamageSource damagesource, float f) {
- if (this.do()) {
+ if (this.do_()) {
Entity entity = damagesource.i();
if (entity instanceof EntityArrow) {
@@ -409,7 +422,7 @@
}
}
- private boolean do() {
+ private boolean do_() {
return this.dj() == 0;
}