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

Update to Minecraft 1.11

Browse Source
This commit is contained in:
md_5
2016-11-17 12:41:03 +11:00
parent 51263e9718
commit c25ddf063a
279 changed files with 3722 additions and 2992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
nms-patches/WorldServer.patch
View File

@@ -54,7 +54,7 @@
+ this.portalTravelAgent = new org.bukkit.craftbukkit.CraftTravelAgent(this); // CraftBukkit
this.H();
this.I();
this.getWorldBorder().a(minecraftserver.aD());
this.getWorldBorder().a(minecraftserver.aE());
@@ -64,6 +84,7 @@
this.villages.a((World) this);
}
@@ -207,7 +207,7 @@
++j;
}
}
@@ -190,25 +309,46 @@
@@ -193,25 +312,46 @@
}
private void c() {
@@ -258,16 +258,16 @@
return false;
} else {
@@ -279,7 +419,7 @@
entityhorse.y(true);
entityhorse.setAgeRaw(0);
entityhorse.setPosition((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
- this.addEntity(entityhorse);
+ this.addEntity(entityhorse, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
@@ -281,7 +421,7 @@
entityhorseskeleton.p(true);
entityhorseskeleton.setAgeRaw(0);
entityhorseskeleton.setPosition((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
- this.addEntity(entityhorseskeleton);
+ this.addEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), true));
} else {
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), false));
@@ -295,11 +435,29 @@
@@ -297,11 +437,29 @@
BlockPosition blockposition1 = blockposition.down();
if (this.v(blockposition1)) {
@@ -299,7 +299,7 @@
}
if (flag && this.getBiome(blockposition1).d()) {
@@ -374,7 +532,7 @@
@@ -376,7 +534,7 @@
public boolean b(BlockPosition blockposition, Block block) {
NextTickListEntry nextticklistentry = new NextTickListEntry(blockposition, block);
@@ -308,7 +308,7 @@
}
public void a(BlockPosition blockposition, Block block, int i) {
@@ -413,8 +571,8 @@
@@ -415,8 +573,8 @@
nextticklistentry.a(j);
}
@@ -319,7 +319,7 @@
this.nextTickList.add(nextticklistentry);
}
}
@@ -436,15 +594,15 @@
@@ -438,15 +596,15 @@
nextticklistentry.a((long) i + this.worldData.getTime());
}
@@ -338,7 +338,7 @@
if (this.emptyTime++ >= 300) {
return;
}
@@ -514,11 +672,17 @@
@@ -516,11 +674,17 @@
} else {
int i = this.nextTickList.size();
@@ -358,7 +358,7 @@
}
this.methodProfiler.a("cleaning");
@@ -531,8 +695,9 @@
@@ -533,8 +697,9 @@
break;
}
@@ -369,7 +369,7 @@
this.U.add(nextticklistentry);
}
@@ -602,7 +767,7 @@
@@ -604,7 +769,7 @@
if (blockposition.getX() >= structureboundingbox.a && blockposition.getX() < structureboundingbox.d && blockposition.getZ() >= structureboundingbox.c && blockposition.getZ() < structureboundingbox.f) {
if (flag) {
if (i == 0) {
@@ -378,7 +378,7 @@
}
iterator.remove();
@@ -620,6 +785,7 @@
@@ -622,6 +787,7 @@
return arraylist;
}
@@ -386,7 +386,7 @@
public void entityJoinedWorld(Entity entity, boolean flag) {
if (!this.getSpawnAnimals() && (entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal)) {
entity.die();
@@ -631,6 +797,7 @@
@@ -633,6 +799,7 @@
super.entityJoinedWorld(entity, flag);
}
@@ -394,7 +394,7 @@
private boolean getSpawnNPCs() {
return this.server.getSpawnNPCs();
@@ -643,7 +810,54 @@
@@ -645,7 +812,54 @@
protected IChunkProvider n() {
IChunkLoader ichunkloader = this.dataManager.createChunkLoader(this.worldProvider);
@@ -450,7 +450,7 @@
}
public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
@@ -705,6 +919,23 @@
@@ -707,6 +921,23 @@
int j = this.worldProvider.getSeaLevel();
int k = 8;
@@ -474,7 +474,7 @@
if (blockposition != null) {
i = blockposition.getX();
k = blockposition.getZ();
@@ -714,7 +945,7 @@
@@ -716,7 +947,7 @@
int l = 0;
@@ -483,7 +483,7 @@
i += random.nextInt(64) - random.nextInt(64);
k += random.nextInt(64) - random.nextInt(64);
++l;
@@ -755,6 +986,7 @@
@@ -758,6 +989,7 @@
ChunkProviderServer chunkproviderserver = this.getChunkProviderServer();
if (chunkproviderserver.e()) {
@@ -491,7 +491,7 @@
if (iprogressupdate != null) {
iprogressupdate.a("Saving level");
}
@@ -765,7 +997,8 @@
@@ -768,7 +1000,8 @@
}
chunkproviderserver.a(flag);
@@ -501,7 +501,7 @@
Iterator iterator = arraylist.iterator();
while (iterator.hasNext()) {
@@ -800,6 +1033,12 @@
@@ -803,6 +1036,12 @@
}
}
@@ -514,7 +514,7 @@
this.worldData.a(this.getWorldBorder().getSize());
this.worldData.d(this.getWorldBorder().getCenterX());
this.worldData.c(this.getWorldBorder().getCenterZ());
@@ -813,9 +1052,13 @@
@@ -816,9 +1055,13 @@
this.worldMaps.a();
}
@@ -530,25 +530,25 @@
public void a(Collection<Entity> collection) {
ArrayList arraylist = Lists.newArrayList(collection);
@@ -834,7 +1077,7 @@
@@ -837,7 +1080,7 @@
private boolean i(Entity entity) {
if (entity.dead) {
- 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
- WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", new Object[] { EntityTypes.a(entity)});
+ // WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", new Object[] { EntityTypes.a(entity)}); // CraftBukkit
return false;
} else {
UUID uuid = entity.getUniqueID();
@@ -846,7 +1089,7 @@
@@ -849,7 +1092,7 @@
this.f.remove(entity1);
} else {
if (!(entity instanceof EntityHuman)) {
- 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
- WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", new Object[] { EntityTypes.a(entity1), uuid.toString()});
+ // WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", new Object[] { EntityTypes.a(entity1), uuid.toString()}); // CraftBukkit
return false;
}
@@ -899,8 +1142,16 @@
@@ -902,8 +1145,16 @@
}
public boolean strikeLightning(Entity entity) {
@@ -566,7 +566,7 @@
return true;
} else {
return false;
@@ -916,10 +1167,20 @@
@@ -919,10 +1170,20 @@
}
public Explosion createExplosion(@Nullable Entity entity, double d0, double d1, double d2, float f, boolean flag, boolean flag1) {
@@ -587,7 +587,7 @@
if (!flag1) {
explosion.clearBlocks();
}
@@ -965,7 +1226,8 @@
@@ -968,7 +1229,8 @@
BlockActionData blockactiondata = (BlockActionData) iterator.next();
if (this.a(blockactiondata)) {
@@ -597,7 +597,7 @@
}
}
@@ -988,6 +1250,7 @@
@@ -991,6 +1253,7 @@
boolean flag = this.W();
super.t();
@@ -605,7 +605,7 @@
if (this.n != this.o) {
this.server.getPlayerList().a((Packet) (new PacketPlayOutGameStateChange(7, this.o)), this.worldProvider.getDimensionManager().getDimensionID());
}
@@ -1006,6 +1269,21 @@
@@ -1009,6 +1272,21 @@
this.server.getPlayerList().sendAll(new PacketPlayOutGameStateChange(7, this.o));
this.server.getPlayerList().sendAll(new PacketPlayOutGameStateChange(8, this.q));
}
@@ -627,7 +627,7 @@
}
@@ -1035,10 +1313,20 @@
@@ -1038,10 +1316,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) {