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

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
paper-server/nms-patches/EntityEnderPearl.patch
View File

@@ -1,6 +1,6 @@
--- ../work/decompile-8eb82bde/net/minecraft/server/EntityEnderPearl.java 2015-01-05 10:11:38.333916086 +1100
+++ src/main/java/net/minecraft/server/EntityEnderPearl.java 2015-01-05 10:11:38.333916086 +1100
@@ -1,7 +1,20 @@
--- /home/matt/mc-dev-private//net/minecraft/server/EntityEnderPearl.java 2015-02-26 22:40:22.523608140 +0000
+++ src/main/java/net/minecraft/server/EntityEnderPearl.java 2015-02-26 22:40:22.523608140 +0000
@@ -1,5 +1,11 @@
package net.minecraft.server;
+// CraftBukkit start
@@ -11,24 +11,13 @@
+
public class EntityEnderPearl extends EntityProjectile {
+ // CraftBukkit start
+ // This is backported from 1.8.1
+ public EntityEnderPearl(World world) {
+ super(world);
+ }
+ // CraftBukkit end
+
public EntityEnderPearl(World world, EntityLiving entityliving) {
super(world, entityliving);
}
@@ -29,14 +42,28 @@
entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
private EntityLiving c;
@@ -41,13 +47,27 @@
this.world.addEntity(entityendermite);
}
-
- if (entityliving.av()) {
- if (entityliving.au()) {
- entityliving.mount((Entity) null);
+
+ // CraftBukkit start - Fire PlayerTeleportEvent
+ org.bukkit.craftbukkit.entity.CraftPlayer player = entityplayer.getBukkitEntity();
+ org.bukkit.Location location = getBukkitEntity().getLocation();
@@ -39,7 +28,7 @@
+ Bukkit.getPluginManager().callEvent(teleEvent);
+
+ if (!teleEvent.isCancelled() && !entityplayer.playerConnection.isDisconnected()) {
+ if (entityliving.av()) {
+ if (entityliving.au()) {
+ entityliving.mount((Entity) null);
+ }
+
@@ -55,5 +44,5 @@
- entityliving.damageEntity(DamageSource.FALL, 5.0F);
+ // CraftBukkit end
}
}
} else if (entityliving != null) {
entityliving.enderTeleportTo(this.locX, this.locY, this.locZ);