patch rebuild

This commit is contained in:
Aikar 2016-03-18 01:47:31 -04:00
parent 4619c60eac
commit 7e81240343
2 changed files with 8 additions and 8 deletions

View File

@ -1,4 +1,4 @@
From cb3407e5a1d00eda5f97d2f12625ba0d418c93e9 Mon Sep 17 00:00:00 2001 From 6a48b3d2cb803c53f6205944ad5c6703b0f9e78f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 00:12:23 -0600 Date: Thu, 3 Mar 2016 00:12:23 -0600
Subject: [PATCH] Process Entity Chunk Registration on Teleport Subject: [PATCH] Process Entity Chunk Registration on Teleport
@ -6,10 +6,10 @@ Subject: [PATCH] Process Entity Chunk Registration on Teleport
Fixes many issues with entities not being properly "switched" to their new chunk on teleport Fixes many issues with entities not being properly "switched" to their new chunk on teleport
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index f80ac2c..3d9a454 100644 index 6f4b46f..7803641 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -252,6 +252,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -253,6 +253,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// entity.world = ((CraftWorld) location.getWorld()).getHandle(); // entity.world = ((CraftWorld) location.getWorld()).getHandle();
// Spigot end // Spigot end
entity.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); entity.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
@ -18,5 +18,5 @@ index f80ac2c..3d9a454 100644
return true; return true;
} }
-- --
2.7.2 2.7.3

View File

@ -1,14 +1,14 @@
From 870093c01103414759a3fcc546329cc99d70746b Mon Sep 17 00:00:00 2001 From c0c895ffba73be2f733ccfb141f2c957381d8bf9 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:48:12 -0600 Date: Thu, 3 Mar 2016 02:48:12 -0600
Subject: [PATCH] Add velocity warnings Subject: [PATCH] Add velocity warnings
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 3d9a454..cb28a8c 100644 index 7803641..92f2cf9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -214,6 +214,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -215,6 +215,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
} }
public void setVelocity(Vector vel) { public void setVelocity(Vector vel) {
@ -22,5 +22,5 @@ index 3d9a454..cb28a8c 100644
entity.motY = vel.getY(); entity.motY = vel.getY();
entity.motZ = vel.getZ(); entity.motZ = vel.getZ();
-- --
2.7.2 2.7.3