Rebuild Patches for upstream changes

This commit is contained in:
Zach Brown 2015-05-30 01:11:16 -05:00
parent 1865d856c6
commit 31fe931194
25 changed files with 54 additions and 685 deletions

View file

@ -1,4 +1,4 @@
From 5e4159e70b2932ce23205409a0fef2c2ac12fa41 Mon Sep 17 00:00:00 2001
From 1485ddd960cb7aef077e350e6f6aac921f1c762e Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 25 May 2015 15:37:00 -0500
Subject: [PATCH] mc-dev imports
@ -85,609 +85,6 @@ index 0000000..29f8554
+
+ public void a_(World world, BlockPosition blockposition) {}
+}
diff --git a/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
new file mode 100644
index 0000000..0d108eb
--- /dev/null
+++ b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
@@ -0,0 +1,597 @@
+package net.minecraft.server;
+
+import com.google.common.collect.Lists;
+import java.util.Iterator;
+import java.util.List;
+
+public abstract class BlockMinecartTrackAbstract extends Block {
+
+ protected final boolean a;
+
+ public static boolean e(World world, BlockPosition blockposition) {
+ return d(world.getType(blockposition));
+ }
+
+ public static boolean d(IBlockData iblockdata) {
+ Block block = iblockdata.getBlock();
+
+ return block == Blocks.RAIL || block == Blocks.GOLDEN_RAIL || block == Blocks.DETECTOR_RAIL || block == Blocks.ACTIVATOR_RAIL;
+ }
+
+ protected BlockMinecartTrackAbstract(boolean flag) {
+ super(Material.ORIENTABLE);
+ this.a = flag;
+ this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F);
+ this.a(CreativeModeTab.e);
+ }
+
+ public AxisAlignedBB a(World world, BlockPosition blockposition, IBlockData iblockdata) {
+ return null;
+ }
+
+ public boolean c() {
+ return false;
+ }
+
+ public MovingObjectPosition a(World world, BlockPosition blockposition, Vec3D vec3d, Vec3D vec3d1) {
+ this.updateShape(world, blockposition);
+ return super.a(world, blockposition, vec3d, vec3d1);
+ }
+
+ public void updateShape(IBlockAccess iblockaccess, BlockPosition blockposition) {
+ IBlockData iblockdata = iblockaccess.getType(blockposition);
+ EnumTrackPosition blockminecarttrackabstract_enumtrackposition = iblockdata.getBlock() == this ? (EnumTrackPosition) iblockdata.get(this.n()) : null;
+
+ if (blockminecarttrackabstract_enumtrackposition != null && blockminecarttrackabstract_enumtrackposition.c()) {
+ this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.625F, 1.0F);
+ } else {
+ this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F);
+ }
+
+ }
+
+ public boolean d() {
+ return false;
+ }
+
+ public boolean canPlace(World world, BlockPosition blockposition) {
+ return World.a((IBlockAccess) world, blockposition.down());
+ }
+
+ public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {
+ if (!world.isClientSide) {
+ iblockdata = this.a(world, blockposition, iblockdata, true);
+ if (this.a) {
+ this.doPhysics(world, blockposition, iblockdata, this);
+ }
+ }
+
+ }
+
+ public void doPhysics(World world, BlockPosition blockposition, IBlockData iblockdata, Block block) {
+ if (!world.isClientSide) {
+ EnumTrackPosition blockminecarttrackabstract_enumtrackposition = (EnumTrackPosition) iblockdata.get(this.n());
+ boolean flag = false;
+
+ if (!World.a((IBlockAccess) world, blockposition.down())) {
+ flag = true;
+ }
+
+ if (blockminecarttrackabstract_enumtrackposition == EnumTrackPosition.ASCENDING_EAST && !World.a((IBlockAccess) world, blockposition.east())) {
+ flag = true;
+ } else if (blockminecarttrackabstract_enumtrackposition == EnumTrackPosition.ASCENDING_WEST && !World.a((IBlockAccess) world, blockposition.west())) {
+ flag = true;
+ } else if (blockminecarttrackabstract_enumtrackposition == EnumTrackPosition.ASCENDING_NORTH && !World.a((IBlockAccess) world, blockposition.north())) {
+ flag = true;
+ } else if (blockminecarttrackabstract_enumtrackposition == EnumTrackPosition.ASCENDING_SOUTH && !World.a((IBlockAccess) world, blockposition.south())) {
+ flag = true;
+ }
+
+ if (flag) {
+ this.b(world, blockposition, iblockdata, 0);
+ world.setAir(blockposition);
+ } else {
+ this.b(world, blockposition, iblockdata, block);
+ }
+
+ }
+ }
+
+ protected void b(World world, BlockPosition blockposition, IBlockData iblockdata, Block block) {}
+
+ protected IBlockData a(World world, BlockPosition blockposition, IBlockData iblockdata, boolean flag) {
+ return world.isClientSide ? iblockdata : (new MinecartTrackLogic(world, blockposition, iblockdata)).a(world.isBlockIndirectlyPowered(blockposition), flag).b();
+ }
+
+ public int k() {
+ return 0;
+ }
+
+ public void remove(World world, BlockPosition blockposition, IBlockData iblockdata) {
+ super.remove(world, blockposition, iblockdata);
+ if (((EnumTrackPosition) iblockdata.get(this.n())).c()) {
+ world.applyPhysics(blockposition.up(), this);
+ }
+
+ if (this.a) {
+ world.applyPhysics(blockposition, this);
+ world.applyPhysics(blockposition.down(), this);
+ }
+
+ }
+
+ public abstract IBlockState<EnumTrackPosition> n();
+
+ static class SyntheticClass_1 {
+
+ static final int[] a = new int[EnumTrackPosition.values().length];
+
+ static {
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.NORTH_SOUTH.ordinal()] = 1;
+ } catch (NoSuchFieldError nosuchfielderror) {
+ ;
+ }
+
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.EAST_WEST.ordinal()] = 2;
+ } catch (NoSuchFieldError nosuchfielderror1) {
+ ;
+ }
+
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.ASCENDING_EAST.ordinal()] = 3;
+ } catch (NoSuchFieldError nosuchfielderror2) {
+ ;
+ }
+
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.ASCENDING_WEST.ordinal()] = 4;
+ } catch (NoSuchFieldError nosuchfielderror3) {
+ ;
+ }
+
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.ASCENDING_NORTH.ordinal()] = 5;
+ } catch (NoSuchFieldError nosuchfielderror4) {
+ ;
+ }
+
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.ASCENDING_SOUTH.ordinal()] = 6;
+ } catch (NoSuchFieldError nosuchfielderror5) {
+ ;
+ }
+
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.SOUTH_EAST.ordinal()] = 7;
+ } catch (NoSuchFieldError nosuchfielderror6) {
+ ;
+ }
+
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.SOUTH_WEST.ordinal()] = 8;
+ } catch (NoSuchFieldError nosuchfielderror7) {
+ ;
+ }
+
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.NORTH_WEST.ordinal()] = 9;
+ } catch (NoSuchFieldError nosuchfielderror8) {
+ ;
+ }
+
+ try {
+ SyntheticClass_1.a[EnumTrackPosition.NORTH_EAST.ordinal()] = 10;
+ } catch (NoSuchFieldError nosuchfielderror9) {
+ ;
+ }
+
+ }
+ }
+
+ public static enum EnumTrackPosition implements INamable {
+
+ NORTH_SOUTH(0, "north_south"), EAST_WEST(1, "east_west"), ASCENDING_EAST(2, "ascending_east"), ASCENDING_WEST(3, "ascending_west"), ASCENDING_NORTH(4, "ascending_north"), ASCENDING_SOUTH(5, "ascending_south"), SOUTH_EAST(6, "south_east"), SOUTH_WEST(7, "south_west"), NORTH_WEST(8, "north_west"), NORTH_EAST(9, "north_east");
+
+ private static final EnumTrackPosition[] k = new EnumTrackPosition[values().length];
+ private final int l;
+ private final String m;
+
+ private EnumTrackPosition(int i, String s) {
+ this.l = i;
+ this.m = s;
+ }
+
+ public int a() {
+ return this.l;
+ }
+
+ public String toString() {
+ return this.m;
+ }
+
+ public boolean c() {
+ return this == EnumTrackPosition.ASCENDING_NORTH || this == EnumTrackPosition.ASCENDING_EAST || this == EnumTrackPosition.ASCENDING_SOUTH || this == EnumTrackPosition.ASCENDING_WEST;
+ }
+
+ public static EnumTrackPosition a(int i) {
+ if (i < 0 || i >= EnumTrackPosition.k.length) {
+ i = 0;
+ }
+
+ return EnumTrackPosition.k[i];
+ }
+
+ public String getName() {
+ return this.m;
+ }
+
+ static {
+ EnumTrackPosition[] ablockminecarttrackabstract_enumtrackposition = values();
+ int i = ablockminecarttrackabstract_enumtrackposition.length;
+
+ for (int j = 0; j < i; ++j) {
+ EnumTrackPosition blockminecarttrackabstract_enumtrackposition = ablockminecarttrackabstract_enumtrackposition[j];
+
+ EnumTrackPosition.k[blockminecarttrackabstract_enumtrackposition.a()] = blockminecarttrackabstract_enumtrackposition;
+ }
+
+ }
+ }
+
+ public class MinecartTrackLogic {
+
+ private final World b;
+ private final BlockPosition c;
+ private final BlockMinecartTrackAbstract d;
+ private IBlockData e;
+ private final boolean f;
+ private final List<BlockPosition> g = Lists.newArrayList();
+
+ public MinecartTrackLogic(World world, BlockPosition blockposition, IBlockData iblockdata) {
+ this.b = world;
+ this.c = blockposition;
+ this.e = iblockdata;
+ this.d = (BlockMinecartTrackAbstract) iblockdata.getBlock();
+ EnumTrackPosition blockminecarttrackabstract_enumtrackposition = (EnumTrackPosition) iblockdata.get(BlockMinecartTrackAbstract.this.n());
+
+ this.f = this.d.a;
+ this.a(blockminecarttrackabstract_enumtrackposition);
+ }
+
+ private void a(EnumTrackPosition blockminecarttrackabstract_enumtrackposition) {
+ this.g.clear();
+ switch (SyntheticClass_1.a[blockminecarttrackabstract_enumtrackposition.ordinal()]) {
+ case 1:
+ this.g.add(this.c.north());
+ this.g.add(this.c.south());
+ break;
+
+ case 2:
+ this.g.add(this.c.west());
+ this.g.add(this.c.east());
+ break;
+
+ case 3:
+ this.g.add(this.c.west());
+ this.g.add(this.c.east().up());
+ break;
+
+ case 4:
+ this.g.add(this.c.west().up());
+ this.g.add(this.c.east());
+ break;
+
+ case 5:
+ this.g.add(this.c.north().up());
+ this.g.add(this.c.south());
+ break;
+
+ case 6:
+ this.g.add(this.c.north());
+ this.g.add(this.c.south().up());
+ break;
+
+ case 7:
+ this.g.add(this.c.east());
+ this.g.add(this.c.south());
+ break;
+
+ case 8:
+ this.g.add(this.c.west());
+ this.g.add(this.c.south());
+ break;
+
+ case 9:
+ this.g.add(this.c.west());
+ this.g.add(this.c.north());
+ break;
+
+ case 10:
+ this.g.add(this.c.east());
+ this.g.add(this.c.north());
+ }
+
+ }
+
+ private void c() {
+ for (int i = 0; i < this.g.size(); ++i) {
+ MinecartTrackLogic blockminecarttrackabstract_minecarttracklogic = this.b((BlockPosition) this.g.get(i));
+
+ if (blockminecarttrackabstract_minecarttracklogic != null && blockminecarttrackabstract_minecarttracklogic.a(this)) {
+ this.g.set(i, blockminecarttrackabstract_minecarttracklogic.c);
+ } else {
+ this.g.remove(i--);
+ }
+ }
+
+ }
+
+ private boolean a(BlockPosition blockposition) {
+ return BlockMinecartTrackAbstract.e(this.b, blockposition) || BlockMinecartTrackAbstract.e(this.b, blockposition.up()) || BlockMinecartTrackAbstract.e(this.b, blockposition.down());
+ }
+
+ private MinecartTrackLogic b(BlockPosition blockposition) {
+ IBlockData iblockdata = this.b.getType(blockposition);
+
+ if (BlockMinecartTrackAbstract.d(iblockdata)) {
+ return BlockMinecartTrackAbstract.this.new MinecartTrackLogic(this.b, blockposition, iblockdata);
+ } else {
+ BlockPosition blockposition1 = blockposition.up();
+
+ iblockdata = this.b.getType(blockposition1);
+ if (BlockMinecartTrackAbstract.d(iblockdata)) {
+ return BlockMinecartTrackAbstract.this.new MinecartTrackLogic(this.b, blockposition1, iblockdata);
+ } else {
+ blockposition1 = blockposition.down();
+ iblockdata = this.b.getType(blockposition1);
+ return BlockMinecartTrackAbstract.d(iblockdata) ? BlockMinecartTrackAbstract.this.new MinecartTrackLogic(this.b, blockposition1, iblockdata) : null;
+ }
+ }
+ }
+
+ private boolean a(MinecartTrackLogic blockminecarttrackabstract_minecarttracklogic) {
+ return this.c(blockminecarttrackabstract_minecarttracklogic.c);
+ }
+
+ private boolean c(BlockPosition blockposition) {
+ for (int i = 0; i < this.g.size(); ++i) {
+ BlockPosition blockposition1 = (BlockPosition) this.g.get(i);
+
+ if (blockposition1.getX() == blockposition.getX() && blockposition1.getZ() == blockposition.getZ()) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ protected int a() {
+ int i = 0;
+ Iterator iterator = EnumDirection.EnumDirectionLimit.HORIZONTAL.iterator();
+
+ while (iterator.hasNext()) {
+ EnumDirection enumdirection = (EnumDirection) iterator.next();
+
+ if (this.a(this.c.shift(enumdirection))) {
+ ++i;
+ }
+ }
+
+ return i;
+ }
+
+ private boolean b(MinecartTrackLogic blockminecarttrackabstract_minecarttracklogic) {
+ return this.a(blockminecarttrackabstract_minecarttracklogic) || this.g.size() != 2;
+ }
+
+ private void c(MinecartTrackLogic blockminecarttrackabstract_minecarttracklogic) {
+ this.g.add(blockminecarttrackabstract_minecarttracklogic.c);
+ BlockPosition blockposition = this.c.north();
+ BlockPosition blockposition1 = this.c.south();
+ BlockPosition blockposition2 = this.c.west();
+ BlockPosition blockposition3 = this.c.east();
+ boolean flag = this.c(blockposition);
+ boolean flag1 = this.c(blockposition1);
+ boolean flag2 = this.c(blockposition2);
+ boolean flag3 = this.c(blockposition3);
+ EnumTrackPosition blockminecarttrackabstract_enumtrackposition = null;
+
+ if (flag || flag1) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_SOUTH;
+ }
+
+ if (flag2 || flag3) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.EAST_WEST;
+ }
+
+ if (!this.f) {
+ if (flag1 && flag3 && !flag && !flag2) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.SOUTH_EAST;
+ }
+
+ if (flag1 && flag2 && !flag && !flag3) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.SOUTH_WEST;
+ }
+
+ if (flag && flag2 && !flag1 && !flag3) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_WEST;
+ }
+
+ if (flag && flag3 && !flag1 && !flag2) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_EAST;
+ }
+ }
+
+ if (blockminecarttrackabstract_enumtrackposition == EnumTrackPosition.NORTH_SOUTH) {
+ if (BlockMinecartTrackAbstract.e(this.b, blockposition.up())) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.ASCENDING_NORTH;
+ }
+
+ if (BlockMinecartTrackAbstract.e(this.b, blockposition1.up())) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.ASCENDING_SOUTH;
+ }
+ }
+
+ if (blockminecarttrackabstract_enumtrackposition == EnumTrackPosition.EAST_WEST) {
+ if (BlockMinecartTrackAbstract.e(this.b, blockposition3.up())) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.ASCENDING_EAST;
+ }
+
+ if (BlockMinecartTrackAbstract.e(this.b, blockposition2.up())) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.ASCENDING_WEST;
+ }
+ }
+
+ if (blockminecarttrackabstract_enumtrackposition == null) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_SOUTH;
+ }
+
+ this.e = this.e.set(this.d.n(), blockminecarttrackabstract_enumtrackposition);
+ this.b.setTypeAndData(this.c, this.e, 3);
+ }
+
+ private boolean d(BlockPosition blockposition) {
+ MinecartTrackLogic blockminecarttrackabstract_minecarttracklogic = this.b(blockposition);
+
+ if (blockminecarttrackabstract_minecarttracklogic == null) {
+ return false;
+ } else {
+ blockminecarttrackabstract_minecarttracklogic.c();
+ return blockminecarttrackabstract_minecarttracklogic.b(this);
+ }
+ }
+
+ public MinecartTrackLogic a(boolean flag, boolean flag1) {
+ BlockPosition blockposition = this.c.north();
+ BlockPosition blockposition1 = this.c.south();
+ BlockPosition blockposition2 = this.c.west();
+ BlockPosition blockposition3 = this.c.east();
+ boolean flag2 = this.d(blockposition);
+ boolean flag3 = this.d(blockposition1);
+ boolean flag4 = this.d(blockposition2);
+ boolean flag5 = this.d(blockposition3);
+ EnumTrackPosition blockminecarttrackabstract_enumtrackposition = null;
+
+ if ((flag2 || flag3) && !flag4 && !flag5) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_SOUTH;
+ }
+
+ if ((flag4 || flag5) && !flag2 && !flag3) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.EAST_WEST;
+ }
+
+ if (!this.f) {
+ if (flag3 && flag5 && !flag2 && !flag4) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.SOUTH_EAST;
+ }
+
+ if (flag3 && flag4 && !flag2 && !flag5) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.SOUTH_WEST;
+ }
+
+ if (flag2 && flag4 && !flag3 && !flag5) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_WEST;
+ }
+
+ if (flag2 && flag5 && !flag3 && !flag4) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_EAST;
+ }
+ }
+
+ if (blockminecarttrackabstract_enumtrackposition == null) {
+ if (flag2 || flag3) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_SOUTH;
+ }
+
+ if (flag4 || flag5) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.EAST_WEST;
+ }
+
+ if (!this.f) {
+ if (flag) {
+ if (flag3 && flag5) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.SOUTH_EAST;
+ }
+
+ if (flag4 && flag3) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.SOUTH_WEST;
+ }
+
+ if (flag5 && flag2) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_EAST;
+ }
+
+ if (flag2 && flag4) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_WEST;
+ }
+ } else {
+ if (flag2 && flag4) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_WEST;
+ }
+
+ if (flag5 && flag2) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_EAST;
+ }
+
+ if (flag4 && flag3) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.SOUTH_WEST;
+ }
+
+ if (flag3 && flag5) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.SOUTH_EAST;
+ }
+ }
+ }
+ }
+
+ if (blockminecarttrackabstract_enumtrackposition == EnumTrackPosition.NORTH_SOUTH) {
+ if (BlockMinecartTrackAbstract.e(this.b, blockposition.up())) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.ASCENDING_NORTH;
+ }
+
+ if (BlockMinecartTrackAbstract.e(this.b, blockposition1.up())) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.ASCENDING_SOUTH;
+ }
+ }
+
+ if (blockminecarttrackabstract_enumtrackposition == EnumTrackPosition.EAST_WEST) {
+ if (BlockMinecartTrackAbstract.e(this.b, blockposition3.up())) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.ASCENDING_EAST;
+ }
+
+ if (BlockMinecartTrackAbstract.e(this.b, blockposition2.up())) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.ASCENDING_WEST;
+ }
+ }
+
+ if (blockminecarttrackabstract_enumtrackposition == null) {
+ blockminecarttrackabstract_enumtrackposition = EnumTrackPosition.NORTH_SOUTH;
+ }
+
+ this.a(blockminecarttrackabstract_enumtrackposition);
+ this.e = this.e.set(this.d.n(), blockminecarttrackabstract_enumtrackposition);
+ if (flag1 || this.b.getType(this.c) != this.e) {
+ this.b.setTypeAndData(this.c, this.e, 3);
+
+ for (int i = 0; i < this.g.size(); ++i) {
+ MinecartTrackLogic blockminecarttrackabstract_minecarttracklogic = this.b((BlockPosition) this.g.get(i));
+
+ if (blockminecarttrackabstract_minecarttracklogic != null) {
+ blockminecarttrackabstract_minecarttracklogic.c();
+ if (blockminecarttrackabstract_minecarttracklogic.b(this)) {
+ blockminecarttrackabstract_minecarttracklogic.c(this);
+ }
+ }
+ }
+ }
+
+ return this;
+ }
+
+ public IBlockData b() {
+ return this.e;
+ }
+ }
+}
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
new file mode 100644
index 0000000..57b3d9d

View file

@ -1,4 +1,4 @@
From 4d8ac043bb719036af19ff4b5b64cd5727f50b03 Mon Sep 17 00:00:00 2001
From d6aece91ea6da949f9f03e5560403f388973996f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 03:47:32 -0500
Subject: [PATCH] Further improve server tick loop
@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1ded833..07422b8 100644
index 1f3fea7..9f4372c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -115,17 +115,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -150,7 +150,7 @@ index 1ded833..07422b8 100644
lastTick = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b5bf0ec..6aa57ae 100644
index 4ddb088..421fa76 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1704,6 +1704,17 @@ public final class CraftServer implements Server {

View file

@ -1,28 +0,0 @@
From 1d624caf17dd3d571fd289c167b7fc713fbb3346 Mon Sep 17 00:00:00 2001
From: Dmck2b <suddenly@suddenly.coffee>
Date: Sun, 8 Mar 2015 03:45:49 -0500
Subject: [PATCH] Temporary fix for rails dupe
diff --git a/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
index 0d108eb..3f34eac 100644
--- a/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
+++ b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
@@ -88,8 +88,12 @@ public abstract class BlockMinecartTrackAbstract extends Block {
}
if (flag) {
- this.b(world, blockposition, iblockdata, 0);
- world.setAir(blockposition);
+ // PaperSpigot start - Rails dupe workaround
+ if (world.getType(blockposition).getBlock().getMaterial() != Material.AIR) {
+ this.b(world, blockposition, iblockdata, 0);
+ world.setAir(blockposition);
+ }
+ // PaperSpigot end
} else {
this.b(world, blockposition, iblockdata, block);
}
--
1.9.1

View file

@ -1,4 +1,4 @@
From fac3d26d0a1927d84ab379d24c2fdef18f955979 Mon Sep 17 00:00:00 2001
From 0892d82b8b48b8d0a3e17b265359b09e80a0b419 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 13:20:22 -0600
Subject: [PATCH] Only refresh abilities if needed

View file

@ -1,4 +1,4 @@
From d48be99422100816e1b6a67a4332ad055d970ca3 Mon Sep 17 00:00:00 2001
From 08969ae80af057218c27d2675eb357cd193c1469 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 04:03:56 -0500
Subject: [PATCH] Player lookup improvements
@ -115,7 +115,7 @@ index 8be0698..4a908c6 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6aa57ae..6150255 100644
index 421fa76..63c157d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -401,7 +401,12 @@ public final class CraftServer implements Server {

View file

@ -1,11 +1,11 @@
From e3dce716d008beed3006863b1e558287be5e7535 Mon Sep 17 00:00:00 2001
From bb12d4e1cf32105d2868a2390b703a4829356e53 Mon Sep 17 00:00:00 2001
From: gsand <gsandowns@gmail.com>
Date: Sun, 8 Mar 2015 04:10:02 -0500
Subject: [PATCH] Configurable game mechanics changes
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index a756192..ce44b25 100644
index f6a43c0..0e6f8c0 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -340,13 +340,7 @@ public class EntityBoat extends Entity {
@ -78,5 +78,5 @@ index ac02b90..f33142a 100644
+ }
}
--
1.9.1
2.4.1.windows.1

View file

@ -1,4 +1,4 @@
From 7dc6789833b6c98f36cf6a54fe28ee09235f69aa Mon Sep 17 00:00:00 2001
From 85b35a7793f55975b68f8134a37e671cc82cda5e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 6 Nov 2014 18:29:20 -0600
Subject: [PATCH] Add async chunk load API
@ -34,5 +34,5 @@ index db0697b..dc45452 100644
return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk;
}
--
2.3.5
2.4.1.windows.1

View file

@ -1,4 +1,4 @@
From 8374f6ca43323da53ee59b7afe95d55398245540 Mon Sep 17 00:00:00 2001
From 5249e032664f21e00091c0895a2f1b9eeb02c48d Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Sun, 30 Nov 2014 18:58:07 -0600
Subject: [PATCH] Allow specified ItemStacks to retain their invalid data

View file

@ -1,4 +1,4 @@
From 57df7afdb750579f89a432f684d0cdb1556e6dc8 Mon Sep 17 00:00:00 2001
From 30b06fc0ea0be63ff6fe80a19691fbee9b1de9e0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 04:23:41 -0500
Subject: [PATCH] Add TNT source location API
@ -29,7 +29,7 @@ index 40c0a87..3a0bc4b 100644
world.addEntity(entitytntprimed);
world.makeSound(entitytntprimed, "game.tnt.primed", 1.0F, 1.0F);
diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java
index 4d1c04e..37e6608 100644
index f91c33d..f3858d1 100644
--- a/src/main/java/net/minecraft/server/DispenserRegistry.java
+++ b/src/main/java/net/minecraft/server/DispenserRegistry.java
@@ -540,7 +540,7 @@ public class DispenserRegistry {
@ -128,5 +128,5 @@ index e08ad47..b7e8b4d 100644
+ // PaperSpigot end
}
--
2.3.5
2.4.1.windows.1

View file

@ -1,11 +1,11 @@
From 1fb4dc33fce6c03c3f59247be6ea2115b9ac41a2 Mon Sep 17 00:00:00 2001
From 9d78e47fc6566cf495d5be31b18f344d0617a1c7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 04:37:23 -0500
Subject: [PATCH] Prevent tile entity and entity crashes
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 0a21872..bbcca2a 100644
index 1971941..d258604 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -163,7 +163,12 @@ public abstract class TileEntity {

View file

@ -1,4 +1,4 @@
From 6d10b8134f0cf1f24b7690f1936eda3a4388acc4 Mon Sep 17 00:00:00 2001
From a0e74a1b58887761a1ef65e2240250383c6fac32 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 23 Feb 2015 14:57:28 -0600
Subject: [PATCH] Configurable top of nether void damage
@ -47,5 +47,5 @@ index f33142a..a6d8532 100644
+ }
}
--
1.9.1
2.4.1.windows.1

View file

@ -1,11 +1,11 @@
From dba1e342404e73aa510c825ffa84e59bff427690 Mon Sep 17 00:00:00 2001
From 066ec86117012a78eda2472cb0abeb54ed67daf8 Mon Sep 17 00:00:00 2001
From: Zach <zach.brown@destroystokyo.com>
Date: Fri, 13 Feb 2015 14:49:30 -0600
Subject: [PATCH] Enderman drop the block they're holding when they die
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index 2bf00b0..ef8225b 100644
index a250062..f3afbbd 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -251,6 +251,13 @@ public class EntityEnderman extends EntityMonster {
@ -23,5 +23,5 @@ index 2bf00b0..ef8225b 100644
public void setCarried(IBlockData iblockdata) {
--
1.9.1
2.4.1.windows.1

View file

@ -1,4 +1,4 @@
From 6f6ad58d8f5db70d6968bef9d6dc604381ca85ad Mon Sep 17 00:00:00 2001
From 2aa0257ec409e8d58fc7c7edb9ad156d2e9e42bf Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 8 Mar 2015 04:52:37 -0500
Subject: [PATCH] PaperSpigot TNT Changes
@ -107,5 +107,5 @@ index a6d8532..1915a7c 100644
+ }
}
--
1.9.1
2.4.1.windows.1

View file

@ -1,11 +1,11 @@
From 3a6dea881c8f50416d7b78d18383e7b211c61656 Mon Sep 17 00:00:00 2001
From 70b52fbafc70a9c62656e0eb25c2992e88199b8e Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 5 Mar 2015 15:30:06 -0600
Subject: [PATCH] Check online mode before converting and renaming player data
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index 007846a..8f05851 100644
index 7c51750..e5124af 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -202,7 +202,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
@ -18,5 +18,5 @@ index 007846a..8f05851 100644
file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
if ( file.exists() )
--
1.9.1
2.4.1.windows.1

View file

@ -1,11 +1,11 @@
From 59b13d78be0e48c6a1bb232cf1c2791e24ed41ce Mon Sep 17 00:00:00 2001
From 7b4b4bb2afc1e4f3656c1c64aecec9e40b442170 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 13 Apr 2015 15:47:15 -0500
Subject: [PATCH] Fix redstone lag issues
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 261c86c..f766467 100644
index d76b965..7624984 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -611,6 +611,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -73,5 +73,5 @@ index 1915a7c..e00581c 100644
+ }
}
--
1.9.4.msysgit.2
2.4.1.windows.1

View file

@ -1,4 +1,4 @@
From abbb5272436f915a1f267cb187a85682a311ef4b Mon Sep 17 00:00:00 2001
From 5bb9ab5fdde00a729230e876df8b1b91612032d8 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 10 Apr 2015 18:07:36 -0500
Subject: [PATCH] Always tick falling blocks
@ -25,5 +25,5 @@ index 621a717..7ca1b24 100644
|| entity instanceof EntityFireworks )
{
--
2.3.5
2.4.1.windows.1

View file

@ -1,4 +1,4 @@
From e798133865d1748942c87c62b7025570ddde9f1f Mon Sep 17 00:00:00 2001
From aa92814f235317afcc2899fa13076d9160971286 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Fri, 17 Apr 2015 02:26:14 -0700
Subject: [PATCH] Add FallingBlock source location API
@ -141,5 +141,5 @@ index 788f26b..f2dfedd 100644
+ // PaperSpigot end
}
--
2.3.5
2.4.1.windows.1

View file

@ -1,11 +1,11 @@
From 3e2edfd6cf5378a589da51fab5094ad02a55ecb0 Mon Sep 17 00:00:00 2001
From d2dd39c4e8d8b414c46aeb076e9614dc8786be6d Mon Sep 17 00:00:00 2001
From: Roman Alexander <romanalexander@users.noreply.github.com>
Date: Wed, 25 Mar 2015 20:27:13 -0500
Subject: [PATCH] Configurable async light updates
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7d90de2..d49e833 100644
index 7d90de2..a0a3297 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,6 +18,12 @@ import org.bukkit.generator.ChunkGenerator;

View file

@ -1,4 +1,4 @@
From 2ddb6a4a68cca73f8fcf579b42a381a1156b248f Mon Sep 17 00:00:00 2001
From db1f0c4ca46a333503cff31dae56557ef27ba9bf Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Fri, 10 Apr 2015 02:24:20 -0700
Subject: [PATCH] Optimize draining
@ -44,5 +44,5 @@ index dc8bebd..1ca8b0d 100644
+ }
}
--
2.3.5
2.4.1.windows.1

View file

@ -1,11 +1,11 @@
From 80e45c4e71cabb79b8452ffc301c4ffd1ebe23c4 Mon Sep 17 00:00:00 2001
From 20605161beae541063eb7cb7f086917c8ea982af Mon Sep 17 00:00:00 2001
From: Roman Alexander <romanalexander@users.noreply.github.com>
Date: Fri, 27 Mar 2015 00:52:24 -0400
Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 4aa8096..ec69752 100644
index 8d2b3a1..961b53b 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -974,7 +974,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -34,5 +34,5 @@ index 1ca8b0d..64f8630 100644
public boolean netherVoidTopDamage;
--
2.3.5
2.4.1.windows.1

View file

@ -1,14 +1,14 @@
From de519945cdd57668fc80157cdef41431a3e40373 Mon Sep 17 00:00:00 2001
From 5cddaabab72536767ae43dd6474e476dc75e5f15 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Mon, 27 Apr 2015 21:41:39 -0500
Subject: [PATCH] Add PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 3854edf..bf83faa 100644
index 26b4f97..6ec167f 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -992,7 +992,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -995,7 +995,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void a(PacketPlayInSettings packetplayinsettings) {
@ -41,5 +41,5 @@ index 211c421..0950b8a 100644
+ // PaperSpigot end
}
--
1.9.1
2.4.1.windows.1

View file

@ -1,11 +1,11 @@
From e43a925b20358a827bb87a42544b4e9531b6d082 Mon Sep 17 00:00:00 2001
From f700750cb70cf8e1903e243cbe12b5ae4844b897 Mon Sep 17 00:00:00 2001
From: Anonymoose <MrAnonHimself@anon.life>
Date: Sun, 3 May 2015 17:44:20 -0500
Subject: [PATCH] Add ArmorStand Marker NBT API
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index ef1904b..e447aec 100644
index d4c82c7..6c1447e 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -649,7 +649,7 @@ public class EntityArmorStand extends EntityLiving {
@ -48,5 +48,5 @@ index 741b765..591c5a1 100644
+ // PaperSpigot end
}
--
1.9.1
2.4.1.windows.1

View file

@ -1,11 +1,11 @@
From 261effe026dc2242c527ed41c0c8316c3ddecf5a Mon Sep 17 00:00:00 2001
From 9ed0afe9c90ca47e4f1b33dc9e6c24f89d49ee4d Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Thu, 30 Apr 2015 22:42:34 -0400
Subject: [PATCH] Fix jar being shaded multiple times
diff --git a/pom.xml b/pom.xml
index b3982e1..aaaf1a5 100644
index 6aeddce..60c1bd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@

View file

@ -1,11 +1,11 @@
From c8b5e5d2a5f28356e4eeaae97dd8dd8dd27d7f60 Mon Sep 17 00:00:00 2001
From bd10e6b9b71c6d47c41eeb6ce76f8cf4e0bbc80c Mon Sep 17 00:00:00 2001
From: DoctorDark <doctordark11@gmail.com>
Date: Thu, 28 May 2015 20:12:38 -0500
Subject: [PATCH] Configurable end credits when leaving the end
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 02e3ce6..40db6ee 100644
index 6ec167f..2ecec5a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -508,11 +508,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

View file

@ -1,4 +1,4 @@
From c033a7f01ec301e2bd423355eabbd1c3468b2100 Mon Sep 17 00:00:00 2001
From c9e8b5efcd939a328d0beec8e97fe89c3dba7299 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 28 May 2015 22:01:25 -0500
Subject: [PATCH] Force load chunks for specific entities that fly through