Remove skeleton bow shoot patch - needs to be updated

This commit is contained in:
md_5 2013-07-02 13:41:40 +10:00
parent 8752e9f61f
commit 658ae8b3fa
20 changed files with 21 additions and 57 deletions

View File

@ -1,36 +0,0 @@
From e2247184da1caa4861674ebd73abb97685df2b77 Mon Sep 17 00:00:00 2001
From: Nick Minkler <sleaker@gmail.com>
Date: Sun, 2 Jun 2013 15:04:37 +1000
Subject: [PATCH] Fix EntityShootBowEvent with Skeletons
diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
index e5db8a1..e175344 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
@@ -242,9 +242,21 @@ public class EntitySkeleton extends EntityMonster implements IRangedEntity {
if (EnchantmentManager.getEnchantmentLevel(Enchantment.ARROW_FIRE.id, this.aV()) > 0 || this.getSkeletonType() == 1) {
entityarrow.setOnFire(100);
}
+ // Spigot - Skeletons should throw EntityShootBowEvents
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent( this, this.bG(), entityarrow, 1.6F );
+ if ( event.isCancelled() )
+ {
+ event.getProjectile().remove();
+ return;
+ }
+ if ( event.getProjectile() == entityarrow.getBukkitEntity() )
+ {
+ this.world.addEntity( entityarrow );
+ }
+ // Spigot end
this.makeSound("random.bow", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));
- this.world.addEntity(entityarrow);
+ // this.world.addEntity(entityarrow); // Spigot - moved up
}
public int getSkeletonType() {
--
1.8.1.2

View File

@ -1,4 +1,4 @@
From 37b756fe7717869043751058b72c97140c97bca4 Mon Sep 17 00:00:00 2001 From a3dc1b3c56a6e4f4155eae074da8cc73e0ac2e8b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000 Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API Subject: [PATCH] Implement Arrow API

View File

@ -1,4 +1,4 @@
From c4d69ccb56478355e96fd2356644267bc9e0c64e Mon Sep 17 00:00:00 2001 From bdbd448daa26790c5048164db3836c5b7c41dd47 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 16:14:30 +1000 Date: Sun, 2 Jun 2013 16:14:30 +1000
Subject: [PATCH] Particle API Subject: [PATCH] Particle API

View File

@ -1,4 +1,4 @@
From 105fa41a716e2452de7edec11e77b116670edd6a Mon Sep 17 00:00:00 2001 From d79943cc3e104b540bcb4c9739a8092540ee00f9 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de> From: DerFlash <bte@freenet.de>
Date: Sun, 2 Jun 2013 16:23:46 +1000 Date: Sun, 2 Jun 2013 16:23:46 +1000
Subject: [PATCH] Hopper Cooldowns Subject: [PATCH] Hopper Cooldowns

View File

@ -1,4 +1,4 @@
From 0cad9daa478ea20a8811fda0aa6b1be088b2521b Mon Sep 17 00:00:00 2001 From 07bb5bdbe904c1f4a54ed228fc70256fc978fe8c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 11:54:32 +1000 Date: Tue, 11 Jun 2013 11:54:32 +1000
Subject: [PATCH] Prevent Shutdown Hang Subject: [PATCH] Prevent Shutdown Hang

View File

@ -1,4 +1,4 @@
From bd3c4cd98d15b1497fff49f3d7ffeda156739e36 Mon Sep 17 00:00:00 2001 From bdb1eaf9986059412f3420f66640c82ee0cafe64 Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com> From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:37 -0500 Date: Mon, 15 Apr 2013 20:06:37 -0500
Subject: [PATCH] Implement SpawnerSpawnEvent. Subject: [PATCH] Implement SpawnerSpawnEvent.

View File

@ -1,4 +1,4 @@
From 1848a09ed6e1261a6e429008e4dc6a72f122ace7 Mon Sep 17 00:00:00 2001 From b9eb03828e1046d342871ac2b9d45040e064a37f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 15 Jun 2013 21:34:48 +1000 Date: Sat, 15 Jun 2013 21:34:48 +1000
Subject: [PATCH] Firework Meta Crash Fix Subject: [PATCH] Firework Meta Crash Fix

View File

@ -1,4 +1,4 @@
From 73f08d785fc177372cc0bf10bbb3b2c6e5db4230 Mon Sep 17 00:00:00 2001 From 31877f07ae2a21b331dd4a0dcd79a55c13943b22 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 16 Jun 2013 08:20:26 +1000 Date: Sun, 16 Jun 2013 08:20:26 +1000
Subject: [PATCH] Do Not Search for Offline Players Subject: [PATCH] Do Not Search for Offline Players

View File

@ -1,4 +1,4 @@
From b2c3886fd681e1c68189efb0aa601abe8d3da099 Mon Sep 17 00:00:00 2001 From 5e2c8a0842c884aa101d794af94e1cfae23473fa Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:53:03 +1000 Date: Fri, 21 Jun 2013 17:53:03 +1000
Subject: [PATCH] Enable Foreign Language Signs Subject: [PATCH] Enable Foreign Language Signs

View File

@ -1,4 +1,4 @@
From 63ad2aad127ee09e6f13c568428b21744ed39765 Mon Sep 17 00:00:00 2001 From e630d3e3ed63f506baaffcd434033ed6c58b536f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:59:22 +1000 Date: Fri, 21 Jun 2013 17:59:22 +1000
Subject: [PATCH] Spam Filter Exclusions Subject: [PATCH] Spam Filter Exclusions

View File

@ -1,4 +1,4 @@
From 39a94d3392478f822c6d6c516e7481690e6d80e1 Mon Sep 17 00:00:00 2001 From 59ccb1461adc862cdda4770df025044de024cec0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000 Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging Subject: [PATCH] Allow Disabling of Command Logging

View File

@ -1,4 +1,4 @@
From b3f5379551202cd0f7a016473533dd5b342780e7 Mon Sep 17 00:00:00 2001 From 7b02d5d839cb7c08670356dceb7875ceb4527415 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000 Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete Subject: [PATCH] Allow Disabling of Command TabComplete

View File

@ -1,4 +1,4 @@
From 33bbaf6237fec8128df72e505d9103611066a736 Mon Sep 17 00:00:00 2001 From 757cc580f167ab1fc7a99ddb1fa8a3f352eabfa8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000 Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages Subject: [PATCH] Configurable Messages

View File

@ -1,4 +1,4 @@
From 8e4023257b2b4de86e1e51c5231850611cc4f60d Mon Sep 17 00:00:00 2001 From 69c148974207bce39d5b0f6052543fc07ccb3b91 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000 Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates Subject: [PATCH] Allow Disabling of Random Lighting Updates

View File

@ -1,4 +1,4 @@
From 83e4c23fbe90fd958af7abc36e9a9b5c93f436ab Mon Sep 17 00:00:00 2001 From bf4cb383481236a4235a2ae958a985e47e668cbe Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:40:11 +1000 Date: Sat, 22 Jun 2013 16:40:11 +1000
Subject: [PATCH] Add Log Filtering Subject: [PATCH] Add Log Filtering

View File

@ -1,4 +1,4 @@
From da1c6b7a9c5d8e3916864b662d9cfabb8aaba4e3 Mon Sep 17 00:00:00 2001 From f67c56f2cf2284b18a8a76b51cbfb5af1b82597e Mon Sep 17 00:00:00 2001
From: Andre LeBlanc <andre@norcode.com> From: Andre LeBlanc <andre@norcode.com>
Date: Sat, 6 Apr 2013 12:00:31 -0400 Date: Sat, 6 Apr 2013 12:00:31 -0400
Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes

View File

@ -1,11 +1,11 @@
From 1b915e0a88471d38ccf1b9b68113eca791847c32 Mon Sep 17 00:00:00 2001 From f4475965718000771df7605bf5ea0f60510aca77 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 25 Jun 2013 18:09:26 +1000 Date: Tue, 25 Jun 2013 18:09:26 +1000
Subject: [PATCH] Always Fire PreLoginEvent Subject: [PATCH] Always Fire PreLoginEvent
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index 6308331..7984666 100644 index b5c305b..2da1a4a 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java --- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java +++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -110,7 +110,7 @@ public class PendingConnection extends Connection { @@ -110,7 +110,7 @@ public class PendingConnection extends Connection {

View File

@ -1,4 +1,4 @@
From 43b70379d2d9eb89c1ff2b0efc7ab3cf1f632f33 Mon Sep 17 00:00:00 2001 From 3808803127bfd8c60cf34b5760e29dfc83c96ee2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000 Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories Subject: [PATCH] Properly Close Inventories

View File

@ -1,4 +1,4 @@
From 7a8f79d0625edaf938fce2372944aeb23018ac9b Mon Sep 17 00:00:00 2001 From 91f19674d7c1182b8c20394f24ce942e2d75e40e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000 Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self Subject: [PATCH] Disallow Interaction With Self

View File

@ -1,4 +1,4 @@
From 5e6e2224d8de860af1cd4aa4a540f5d43bbc06f0 Mon Sep 17 00:00:00 2001 From ebe19863a959976b5cfec8b1642fc519c32f12a5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:07:54 +1000 Date: Tue, 2 Jul 2013 09:07:54 +1000
Subject: [PATCH] Lower Chunk Compression Subject: [PATCH] Lower Chunk Compression
@ -6,7 +6,7 @@ Subject: [PATCH] Lower Chunk Compression
Use a chunk compression level of 4 - this provides an optimal balance between speed and compression. Use a chunk compression level of 4 - this provides an optimal balance between speed and compression.
diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
index 4c24f80..b7840a4 100644 index df87ab5..4ef8881 100644
--- a/src/main/java/net/minecraft/server/Packet51MapChunk.java --- a/src/main/java/net/minecraft/server/Packet51MapChunk.java
+++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java +++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java
@@ -29,7 +29,7 @@ public class Packet51MapChunk extends Packet { @@ -29,7 +29,7 @@ public class Packet51MapChunk extends Packet {