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

Finish up the patches for 1.5. Now to test.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-03-16 09:08:53 +11:00
parent 12afb9956e
commit 8cd6af53fe
7 changed files with 79 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d9054dc5ea2715c2eb9065ad6ef3ceb47446039c Mon Sep 17 00:00:00 2001
From 3ba945cbabc950764794373d3a38d5fd5ce03434 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
@@ -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 4b6c910..417189e 100644
index e7354b7..46e3bc6 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 449f3e1..25c462e 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..79be52d 100644
index ad65bca..ee0fdbf 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..79be52d 100644
+ */
+ public static boolean checkEntityImmunities(Entity entity) {
+ // quick checks.
+ if (entity.ad /* isInWater */ || entity.fireTicks > 0) {
+ if (entity.ae /* isInWater */ || entity.fireTicks > 0) {
+ return true;
+ }
+ if (!(entity instanceof EntityArrow)) {