TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update orebfuscator on block update.

Browse source
This commit is contained in:
md_5 2013-11-27 22:01:50 +11:00
parent 5b808a6d45
commit 71d3b3b5ad
6 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CraftBukkit-Patches/0018-Orebfuscator.patch
View file

@ -1,4 +1,4 @@
From 57f7e3af097da4a29c45f5de59a406b8a4b2a738 Mon Sep 17 00:00:00 2001
From 61bd37b5410c326094dde16492c13924c032416a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 16 May 2013 18:51:05 +1000
Subject: [PATCH] Orebfuscator
@ -114,6 +114,18 @@ index 16420e4..db2e2a7 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3143d6e..48fbd2b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -482,6 +482,7 @@ public abstract class World implements IBlockAccess {
this.g(i, j + 1, k, l);
this.g(i, j, k - 1, l);
this.g(i, j, k + 1, l);
+ spigotConfig.antiXrayInstance.updateNearbyBlocks(this, i, j, k); // Spigot
}
public void c(int i, int j, int k, int l, int i1) {
diff --git a/src/main/java/org/spigotmc/AntiXray.java b/src/main/java/org/spigotmc/AntiXray.java
new file mode 100644
index 0000000..c165304
@ -366,5 +378,5 @@ index 3e66d79..bab9d8f 100644
+ }
}
--
1.8.1.2
1.8.3.2

8
CraftBukkit-Patches/0020-Handle-Null-Tile-Entities.patch
View file

@ -1,14 +1,14 @@
From 6562b0f38a2a0ddf67c80fbf2051deb098ded266 Mon Sep 17 00:00:00 2001
From 68c93664b0745e9249dafc95a562c0db1f8199d9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9da3f13..6206167 100644
index 48fbd2b..805b8eb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1334,6 +1334,13 @@ public abstract class World implements IBlockAccess {
@@ -1335,6 +1335,13 @@ public abstract class World implements IBlockAccess {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();
@ -23,5 +23,5 @@ index 9da3f13..6206167 100644
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
--
1.8.1.2
1.8.3.2

16
CraftBukkit-Patches/0021-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From d7c99359b50c44a382c6238dc1934574b0a4d5a8 Mon Sep 17 00:00:00 2001
From 8e12cb3752d63dd7febab152ce56319e0671e9fc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 76d9998..bb4a394 100644
index d65c123..4183297 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -88,7 +88,7 @@ public abstract class Entity {
@ -87,7 +87,7 @@ index 5ba19f3..4c73a5f 100644
super(world);
}
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index a4766c5..23fd1a8 100644
index c9ec78a..b1d3de8 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -14,7 +14,7 @@ public class EntityArrow extends Entity implements IProjectile {
@ -100,7 +100,7 @@ index a4766c5..23fd1a8 100644
public int shake;
public Entity shooter;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ea79919..6b8b8dd 100644
index 16a16cf..76dfa81 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -78,6 +78,13 @@ public abstract class EntityLiving extends Entity {
@ -118,10 +118,10 @@ index ea79919..6b8b8dd 100644
public EntityLiving(World world) {
super(world);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6206167..211127b 100644
index 805b8eb..ab1ac5e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1276,6 +1276,7 @@ public abstract class World implements IBlockAccess {
@@ -1277,6 +1277,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.methodProfiler.c("regular");
@ -129,7 +129,7 @@ index 6206167..211127b 100644
timings.entityTick.startTiming(); // Spigot
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1436,8 +1437,13 @@ public abstract class World implements IBlockAccess {
@@ -1437,8 +1438,13 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ);
byte b0 = 32;
@ -482,5 +482,5 @@ index 9f95452..cca32b5 100644
+ }
}
--
1.8.1.2
1.8.3.2

8
CraftBukkit-Patches/0049-Allow-Disabling-of-Random-Lighting-Updates.patch
View file

@ -1,14 +1,14 @@
From fedd7e005c23bce7405ae6ae8360ea9177ff6537 Mon Sep 17 00:00:00 2001
From 60c96ecddddb89969bbda55baf687b42402df903 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 51a8d58..84ee535 100644
index ab1ac5e..e594b04 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2103,7 +2103,7 @@ public abstract class World implements IBlockAccess {
@@ -2104,7 +2104,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");
@ -34,5 +34,5 @@ index b63d3ad..2caafa2 100644
+ }
}
--
1.8.1.2
1.8.3.2

14
CraftBukkit-Patches/0060-Entity-ticking-chunk-caching.patch
View file

@ -1,4 +1,4 @@
From 7ea326c5cf11a4802e87a958617034c2f48b9e0a Mon Sep 17 00:00:00 2001
From 7e3f4169dfdf4b85dce2e1fa1e9a9e242cfbb030 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Tue, 16 Jul 2013 03:32:32 +0500
Subject: [PATCH] Entity ticking chunk caching
@ -6,10 +6,10 @@ Subject: [PATCH] Entity ticking chunk caching
Cache known loaded chunks so we avoid making a potentially expensive contains call for every single entity in exchange for some simple arithmetic. Best case scenario, this cuts down contains call to once per chunk, worst case it adds on some simple arithmetic operations
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 84ee535..06759cd 100644
index e594b04..690f768 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1221,6 +1221,7 @@ public abstract class World implements IBlockAccess {
@@ -1222,6 +1222,7 @@ public abstract class World implements IBlockAccess {
CrashReport crashreport;
CrashReportSystemDetails crashreportsystemdetails;
@ -17,7 +17,7 @@ index 84ee535..06759cd 100644
for (i = 0; i < this.i.size(); ++i) {
entity = (Entity) this.i.get(i);
// CraftBukkit start - Fixed an NPE, don't process entities in chunks queued for unload
@@ -1229,10 +1230,15 @@ public abstract class World implements IBlockAccess {
@@ -1230,10 +1231,15 @@ public abstract class World implements IBlockAccess {
}
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
@ -35,7 +35,7 @@ index 84ee535..06759cd 100644
try {
++entity.ticksLived;
@@ -1253,6 +1259,7 @@ public abstract class World implements IBlockAccess {
@@ -1254,6 +1260,7 @@ public abstract class World implements IBlockAccess {
this.i.remove(i--);
}
}
@ -43,7 +43,7 @@ index 84ee535..06759cd 100644
this.methodProfiler.c("remove");
this.entityList.removeAll(this.f);
@@ -1283,10 +1290,15 @@ public abstract class World implements IBlockAccess {
@@ -1284,10 +1291,15 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Don't tick entities in chunks queued for unload
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
@ -62,5 +62,5 @@ index 84ee535..06759cd 100644
if (entity.vehicle != null) {
if (!entity.vehicle.dead && entity.vehicle.passenger == entity) {
--
1.8.1.2
1.8.3.2

10
CraftBukkit-Patches/0065-Guard-entity-list.patch
View file

@ -1,11 +1,11 @@
From ab3165faa242ad961f1cd19308a9ef51c7cc8ac9 Mon Sep 17 00:00:00 2001
From 7fb383919a5aa0e3be32033ba0be45553a590393 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Sat, 3 Aug 2013 21:42:00 +0500
Subject: [PATCH] Guard entity list
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 06759cd..cb21133 100644
index 690f768..e3ff733 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -29,7 +29,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@ -43,7 +43,7 @@ index 06759cd..cb21133 100644
protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
protected float growthOdds = 100;
protected float modifiedOdds = 100;
@@ -1285,6 +1304,7 @@ public abstract class World implements IBlockAccess {
@@ -1286,6 +1305,7 @@ public abstract class World implements IBlockAccess {
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
@ -51,7 +51,7 @@ index 06759cd..cb21133 100644
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1332,12 +1352,15 @@ public abstract class World implements IBlockAccess {
@@ -1333,12 +1353,15 @@ public abstract class World implements IBlockAccess {
this.getChunkAt(j, k).b(entity);
}
@ -68,5 +68,5 @@ index 06759cd..cb21133 100644
timings.entityTick.stopTiming(); // Spigot
this.methodProfiler.c("tileEntities");
--
1.8.1.2
1.8.3.2