Disable Chunk Unload Queue Patch for now

This commit is contained in:
Aikar 2016-03-20 00:53:34 -04:00
parent 532e229c28
commit a1651ffd8e
8 changed files with 17 additions and 17 deletions

View File

@ -1,4 +1,4 @@
From b13bb267023ea301e6788d681b6c894611645c8b Mon Sep 17 00:00:00 2001 From 2adb5317b40c4ec51aa63cfb68ba1e11d65dfd82 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 19:15:44 -0400 Date: Fri, 18 Mar 2016 19:15:44 -0400
Subject: [PATCH] Optimize BlockStateList/BlockData Subject: [PATCH] Optimize BlockStateList/BlockData
@ -41,5 +41,5 @@ index a11c62f..43f198b 100644
public ImmutableMap<IBlockState<?>, Comparable<?>> s() { public ImmutableMap<IBlockState<?>, Comparable<?>> s() {
-- --
2.7.3 2.7.4

View File

@ -1,4 +1,4 @@
From 6a8a879e92e5058a3c510aa0f82596ee13c5ee29 Mon Sep 17 00:00:00 2001 From 916b06f2f76736a0b05010a465ff5e0c16b7fdcb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 20:16:03 -0400 Date: Fri, 18 Mar 2016 20:16:03 -0400
Subject: [PATCH] Add World Util Methods Subject: [PATCH] Add World Util Methods
@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
Methods that can be used for other patches to help improve logic. Methods that can be used for other patches to help improve logic.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f996c53..d8bd36c 100644 index b356aa6..a6c8e53 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -156,6 +156,12 @@ public abstract class World implements IBlockAccess { @@ -156,6 +156,12 @@ public abstract class World implements IBlockAccess {
@ -20,9 +20,9 @@ index f996c53..d8bd36c 100644
+ // Paper end + // Paper end
+ +
public Chunk getChunkIfLoaded(int x, int z) { public Chunk getChunkIfLoaded(int x, int z) {
return ((ChunkProviderServer) this.chunkProvider).getLoadedChunkAtWithoutMarkingActive(x, z); // Paper - This is added by CB, and will not mark as active. Simply an alias return ((ChunkProviderServer) this.chunkProvider).getChunkIfLoaded(x, z);
} }
@@ -634,6 +640,41 @@ public abstract class World implements IBlockAccess { @@ -628,6 +634,41 @@ public abstract class World implements IBlockAccess {
} }
} }
@ -64,7 +64,7 @@ index f996c53..d8bd36c 100644
public int getLightLevel(BlockPosition blockposition) { public int getLightLevel(BlockPosition blockposition) {
return this.c(blockposition, true); return this.c(blockposition, true);
} }
@@ -748,6 +789,27 @@ public abstract class World implements IBlockAccess { @@ -742,6 +783,27 @@ public abstract class World implements IBlockAccess {
return this.worldProvider.n()[this.getLightLevel(blockposition)]; return this.worldProvider.n()[this.getLightLevel(blockposition)];
} }

View File

@ -1,4 +1,4 @@
From ec825855931a7fc5824289d9c60a1fbd69809887 Mon Sep 17 00:00:00 2001 From 0b102494f2d663eb3fd386a7e692cfd46b84a4f1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 21:22:56 -0400 Date: Fri, 18 Mar 2016 21:22:56 -0400
Subject: [PATCH] Optimized Light Level Comparisons Subject: [PATCH] Optimized Light Level Comparisons
@ -131,5 +131,5 @@ index 949452c..d6c07a2 100644
if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
-- --
2.7.3 2.7.4

View File

@ -1,4 +1,4 @@
From 2c7a29fbfa9acfcf9dcd896415ed953a0649b0c3 Mon Sep 17 00:00:00 2001 From 04fd8f7d4f3cd1c3351ef21c0c6b17108f9db68a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 19 Mar 2016 15:16:54 -0400 Date: Sat, 19 Mar 2016 15:16:54 -0400
Subject: [PATCH] Pass world to Village creation Subject: [PATCH] Pass world to Village creation
@ -32,5 +32,5 @@ index 932eeb7..9b59dcb 100644
this.d = BlockPosition.ZERO; this.d = BlockPosition.ZERO;
this.j = new TreeMap(); this.j = new TreeMap();
-- --
2.7.3 2.7.4

View File

@ -1,11 +1,11 @@
From 802d84654bf55a30dbb2e182f46f8b206ca8d731 Mon Sep 17 00:00:00 2001 From 1de7a4205fd60aa30189386d3bf85aef1ad29405 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:07:20 -0400 Date: Sun, 21 Jun 2015 15:07:20 -0400
Subject: [PATCH] Custom replacement for eaten items Subject: [PATCH] Custom replacement for eaten items
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 5cb2f8e..3c4501b 100644 index 40abc3a..3e92dcc 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2214,12 +2214,25 @@ public abstract class EntityLiving extends Entity { @@ -2214,12 +2214,25 @@ public abstract class EntityLiving extends Entity {
@ -35,5 +35,5 @@ index 5cb2f8e..3c4501b 100644
} }
-- --
2.7.3 2.7.4

View File

@ -1,4 +1,4 @@
From 7d325496113f18deda2c942e4f3e92013235a0b9 Mon Sep 17 00:00:00 2001 From 047f45354145583cbe356066478979ae5e30ca56 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 19 Jul 2015 16:51:38 -0400 Date: Sun, 19 Jul 2015 16:51:38 -0400
Subject: [PATCH] Set health before death event Subject: [PATCH] Set health before death event
@ -46,5 +46,5 @@ index 693d5cb..ef522e7 100644
public double getMaxHealth() { public double getMaxHealth() {
-- --
2.7.3 2.7.4

View File

@ -1,4 +1,4 @@
From e1be9ab34e3afe58f661278015309c564c953717 Mon Sep 17 00:00:00 2001 From da36bdf1db31abd6f92054f6fd35eb65b5b5f6cf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400 Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data Subject: [PATCH] handle NaN health/absorb values and repair bad data