mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to Minecraft 1.10

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2016-06-09 11:43:49 +10:00
commit a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions
Download patch file Download diff file Expand all files Collapse all files

24
paper-server/nms-patches/WorldServer.patch
View file

@ -30,7 +30,7 @@
private boolean O;
@@ -38,14 +49,22 @@
private int T;
private List<NextTickListEntry> U = Lists.newArrayList();
private final List<NextTickListEntry> U = Lists.newArrayList();
- public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, WorldData worlddata, int i, MethodProfiler methodprofiler) {
- super(idatamanager, worlddata, DimensionManager.a(i).d(), methodprofiler, false);
@ -258,7 +258,7 @@
return false;
} else {
@@ -279,7 +418,7 @@
entityhorse.x(true);
entityhorse.y(true);
entityhorse.setAgeRaw(0);
entityhorse.setPosition((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
- this.addEntity(entityhorse);
@ -531,8 +531,8 @@
private boolean i(Entity entity) {
if (entity.dead) {
- WorldServer.a.warn("Tried to add entity " + EntityTypes.b(entity) + " but it was marked as removed already");
+ // WorldServer.a.warn("Tried to add entity " + EntityTypes.b(entity) + " but it was marked as removed already"); // CraftBukkit
- WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", new Object[] { EntityTypes.b(entity)});
+ // WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", new Object[] { EntityTypes.b(entity)}); // CraftBukkit
return false;
} else {
UUID uuid = entity.getUniqueID();
@ -540,12 +540,12 @@
this.f.remove(entity1);
} else {
if (!(entity instanceof EntityHuman)) {
- WorldServer.a.warn("Keeping entity " + EntityTypes.b(entity1) + " that already exists with UUID " + uuid.toString());
+ // WorldServer.a.warn("Keeping entity " + EntityTypes.b(entity1) + " that already exists with UUID " + uuid.toString()); // CraftBukkit
- WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", new Object[] { EntityTypes.b(entity1), uuid.toString()});
+ // WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", new Object[] { EntityTypes.b(entity1), uuid.toString()}); // CraftBukkit
return false;
}
@@ -889,8 +1131,16 @@
@@ -899,8 +1141,16 @@
}
public boolean strikeLightning(Entity entity) {
@ -563,7 +563,7 @@
return true;
} else {
return false;
@@ -906,10 +1156,20 @@
@@ -916,10 +1166,20 @@
}
public Explosion createExplosion(@Nullable Entity entity, double d0, double d1, double d2, float f, boolean flag, boolean flag1) {
@ -584,7 +584,7 @@
if (!flag1) {
explosion.clearBlocks();
}
@@ -955,7 +1215,8 @@
@@ -965,7 +1225,8 @@
BlockActionData blockactiondata = (BlockActionData) iterator.next();
if (this.a(blockactiondata)) {
@ -594,7 +594,7 @@
}
}
@@ -978,6 +1239,7 @@
@@ -988,6 +1249,7 @@
boolean flag = this.W();
super.t();
@ -602,7 +602,7 @@
if (this.n != this.o) {
this.server.getPlayerList().a((Packet) (new PacketPlayOutGameStateChange(7, this.o)), this.worldProvider.getDimensionManager().getDimensionID());
}
@@ -996,6 +1258,21 @@
@@ -1006,6 +1268,21 @@
this.server.getPlayerList().sendAll(new PacketPlayOutGameStateChange(7, this.o));
this.server.getPlayerList().sendAll(new PacketPlayOutGameStateChange(8, this.q));
}
@ -624,7 +624,7 @@
}
@@ -1025,10 +1302,20 @@
@@ -1035,10 +1312,20 @@
}
public void a(EnumParticle enumparticle, boolean flag, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, int... aint) {