SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.5.1

Browse Source 
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
This commit is contained in:
Spigot
2013-03-20 21:54:12 +00:00
parent 9a3a09e79b
commit f370ab8784
46 changed files with 153 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CraftBukkit-Patches/0024-Entity-Activation-Range.patch
View File

@@ -1,4 +1,4 @@
From d78fe7a23cc168df381cd729ba08886b26c10fb2 Mon Sep 17 00:00:00 2001
From 037bd973e2b44ad4421765c49603b4cef7594746 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
@@ -19,15 +19,15 @@ This change can have dramatic impact on gameplay if configured too low. Balance
8 files changed, 263 insertions(+), 7 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c68e9cf..9e5ce4b 100644
index ccc4858..24ab35f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -89,7 +89,7 @@ public abstract class Entity {
public int ticksLived;
public int maxFireTicks;
public int fireTicks; // CraftBukkit - private -> public
- protected boolean ae;
+ public boolean ae; // Spigot - private -> public isInWater - If this renames, update Spigot.checkEntityImmunities
- protected boolean inWater;
+ public boolean inWater; // Spigot - protected -> public
public int noDamageTicks;
private boolean justCreated;
protected boolean fireProof;
@@ -89,7 +89,7 @@ index bc69f5d..430dd79 100644
// CraftBukkit start
if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 24de0c7..a97649e 100644
index 2a5c60e..9f7eea6 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
@@ -174,7 +174,7 @@ index 38e551b..813f662 100644
public Block getBlockAt(int x, int y, int z) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index ad65bca..ee0fdbf 100644
index ad65bca..8012ff8 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,9 +1,17 @@
@@ -346,7 +346,7 @@ index ad65bca..ee0fdbf 100644
+ */
+ public static boolean checkEntityImmunities(Entity entity) {
+ // quick checks.
+ if (entity.ae /* isInWater */ || entity.fireTicks > 0) {
+ if (entity.inWater /* isInWater */ || entity.fireTicks > 0) {
+ return true;
+ }
+ if (!(entity instanceof EntityArrow)) {
@@ -441,5 +441,5 @@ index 78e9a66..e568bf6 100644
growth-chunks-per-tick: 1000
world_nether:
--
1.8.1-rc2
1.8.2