Update to latest upstream
Dieser Commit ist enthalten in:
Ursprung
7657d02332
Commit
63116b317c
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
@ -1,14 +1,14 @@
|
|||||||
From 1a0dd596df41308fe8c1e954cccb1d5a3879f4b4 Mon Sep 17 00:00:00 2001
|
From cacfe32fe6f8f4440709700758ea102d97042fed 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
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index e5937fc..1422d67 100644
|
index 2f6cd41..7c7c07a 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
@@ -1578,7 +1578,7 @@ public class PlayerConnection extends Connection {
|
@@ -1586,7 +1586,7 @@ public class PlayerConnection extends Connection {
|
||||||
flag = false;
|
flag = false;
|
||||||
} else {
|
} else {
|
||||||
for (i = 0; i < packet130updatesign.lines[j].length(); ++i) {
|
for (i = 0; i < packet130updatesign.lines[j].length(); ++i) {
|
||||||
|
@ -1,47 +0,0 @@
|
|||||||
From 90ebcdf6803c60b94bca14371f8056bb01d0721b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
|
|
||||||
Date: Tue, 2 Jul 2013 19:00:01 +0100
|
|
||||||
Subject: [PATCH] Close Horse Inventory on Disconnect
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
|
|
||||||
index 5e7e571..11a7a09 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/EntityHorse.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
|
|
||||||
@@ -20,7 +20,7 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
|
|
||||||
public int bp;
|
|
||||||
public int bq;
|
|
||||||
protected boolean br;
|
|
||||||
- private InventoryHorseChest bG;
|
|
||||||
+ public InventoryHorseChest bG; // Spigot - private -> public
|
|
||||||
private boolean bH;
|
|
||||||
protected int bs;
|
|
||||||
protected float bt;
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
||||||
index cbe823f..1ca4c81 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
||||||
@@ -31,6 +31,8 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
// CraftBukkit end
|
|
||||||
|
|
||||||
+import org.bukkit.entity.HumanEntity; //Spigot
|
|
||||||
+
|
|
||||||
public abstract class PlayerList {
|
|
||||||
|
|
||||||
private static final SimpleDateFormat d = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
|
|
||||||
@@ -261,6 +263,11 @@ public abstract class PlayerList {
|
|
||||||
WorldServer worldserver = entityplayer.p();
|
|
||||||
|
|
||||||
if (entityplayer.vehicle != null) {
|
|
||||||
+ if (entityplayer.vehicle instanceof EntityHorse) {
|
|
||||||
+ for (HumanEntity humanEntity : new ArrayList<HumanEntity>(((EntityHorse) entityplayer.vehicle).bG.getViewers())) {
|
|
||||||
+ humanEntity.closeInventory();
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
worldserver.removeEntity(entityplayer.vehicle);
|
|
||||||
System.out.println("removing player mount");
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
In neuem Issue referenzieren
Einen Benutzer sperren