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

Update from upstream SpigotMC take 2: Update harder

Browse Source
This commit is contained in:
Zach Brown
2014-12-27 16:07:04 -06:00
parent 4832a37296
commit 105e5e9ba4
5 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
CraftBukkit-Patches/0159-Disable-Explosion-avoiding-for-all-mobs.patch Normal file
View File

@@ -0,0 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 27 Dec 2014 21:08:51 +0000
Subject: [PATCH] Disable Explosion avoiding for all mobs
Its going in 1.8.1 anyway
diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityMonster.java
+++ b/src/main/java/net/minecraft/server/EntityMonster.java
@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityCombustByEntityEvent; // CraftBukkit
public abstract class EntityMonster extends EntityCreature implements IMonster {
- protected final PathfinderGoal a = new PathfinderGoalAvoidTarget(this, new EntitySelectorExplodingCreeper(this), 4.0F, 1.0D, 2.0D);
+ protected final PathfinderGoal a = null; // Spigot : new PathfinderGoalAvoidTarget(this, new EntitySelectorExplodingCreeper(this), 4.0F, 1.0D, 2.0D);
public EntityMonster(World world) {
super(world);
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -0,0 +0,0 @@ public class PathfinderGoalSelector {
}
public void a(int i, PathfinderGoal pathfindergoal) {
+ if (pathfindergoal == null) return; // Spigot
this.b.add(new PathfinderGoalSelectorItem(this, i, pathfindergoal));
}
--