Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to 1.6.2

Browse Source
This commit is contained in:
mbax
2013-07-08 19:43:37 -04:00
parent 2d9a9d8cea
commit f6a0b1e426
87 changed files with 1162 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/minecraft/server/WorldServer.java
View File

@@ -610,24 +610,10 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
entity.die();
}
if (!(entity.passenger instanceof EntityHuman)) {
super.entityJoinedWorld(entity, flag);
}
super.entityJoinedWorld(entity, flag);
}
// CraftBukkit end */
public void vehicleEnteredWorld(Entity entity, boolean flag) {
try {
super.entityJoinedWorld(entity, flag);
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Forcefully ticking entity");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being force ticked");
entity.a(crashreportsystemdetails);
throw new ReportedException(crashreport);
}
}
protected IChunkProvider j() {
IChunkLoader ichunkloader = this.dataManager.createChunkLoader(this.worldProvider);
@@ -799,7 +785,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
protected void a(Entity entity) {
super.a(entity);
this.entitiesById.a(entity.id, entity);
Entity[] aentity = entity.am();
Entity[] aentity = entity.an();
if (aentity != null) {
for (int i = 0; i < aentity.length; ++i) {
@@ -811,7 +797,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
protected void b(Entity entity) {
super.b(entity);
this.entitiesById.d(entity.id);
Entity[] aentity = entity.am();
Entity[] aentity = entity.an();
if (aentity != null) {
for (int i = 0; i < aentity.length; ++i) {