mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
95 lines
4.3 KiB
Diff
95 lines
4.3 KiB
Diff
From 335fcf9c78363c270df947932490c1f5bddd224b Mon Sep 17 00:00:00 2001
|
||
From: md_5 <git@md-5.net>
|
||
Date: Sat, 12 Apr 2014 17:49:14 +1000
|
||
Subject: [PATCH] Fix several occurances of missed diff.
|
||
|
||
|
||
diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java b/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java
|
||
index d16f035..9fe2a8b 100644
|
||
--- a/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java
|
||
+++ b/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java
|
||
@@ -15,7 +15,7 @@ final class DispenseBehaviorFireball extends DispenseBehaviorItem {
|
||
EnumFacing enumfacing = BlockDispenser.b(isourceblock.h());
|
||
IPosition iposition = BlockDispenser.a(isourceblock);
|
||
double d0 = iposition.getX() + (double) ((float) enumfacing.getAdjacentX() * 0.3F);
|
||
- double d1 = iposition.getY() + (double) ((float) enumfacing.getAdjacentY() * 0.3F);
|
||
+ double d1 = iposition.getY() + (double) ((float) enumfacing.getAdjacentX() * 0.3F);
|
||
double d2 = iposition.getZ() + (double) ((float) enumfacing.getAdjacentZ() * 0.3F);
|
||
World world = isourceblock.k();
|
||
Random random = world.random;
|
||
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
|
||
index 8250395..066a3be 100644
|
||
--- a/src/main/java/net/minecraft/server/EntityBoat.java
|
||
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
|
||
@@ -147,7 +147,7 @@ public class EntityBoat extends Entity {
|
||
return !this.dead;
|
||
}
|
||
|
||
- public void h() {
|
||
+ public void h() {
|
||
// CraftBukkit start
|
||
double prevX = this.locX;
|
||
double prevY = this.locY;
|
||
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
||
index 0f1bcc7..5eb893f 100644
|
||
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
||
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
||
@@ -320,7 +320,7 @@ public class EntityItem extends Entity {
|
||
public ItemStack getItemStack() {
|
||
ItemStack itemstack = this.getDataWatcher().getItemStack(10);
|
||
|
||
- return itemstack == null ? new ItemStack(Blocks.STONE) : itemstack;
|
||
+ return itemstack == null ? new ItemStack(Blocks.STONE) : itemstack;
|
||
}
|
||
|
||
public void setItemStack(ItemStack itemstack) {
|
||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||
index b1098bb..805d24f 100644
|
||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||
@@ -1736,7 +1736,7 @@ public class PlayerConnection implements PacketPlayInListener {
|
||
}
|
||
|
||
if (itemstack.getItem() == Items.WRITTEN_BOOK && itemstack1.getItem() == Items.BOOK_AND_QUILL) {
|
||
- CraftEventFactory.handleEditBookEvent(player, itemstack); // CraftBukkit
|
||
+ CraftEventFactory.handleEditBookEvent(player, itemstack); // CraftBukkit
|
||
}
|
||
|
||
return;
|
||
diff --git a/src/main/java/net/minecraft/server/PlayerSelector.java b/src/main/java/net/minecraft/server/PlayerSelector.java
|
||
index e7615d3..2b2d510 100644
|
||
--- a/src/main/java/net/minecraft/server/PlayerSelector.java
|
||
+++ b/src/main/java/net/minecraft/server/PlayerSelector.java
|
||
@@ -1,6 +1,10 @@
|
||
package net.minecraft.server;
|
||
|
||
-import java.util.*;
|
||
+import java.util.Collections;
|
||
+import java.util.HashMap;
|
||
+import java.util.Iterator;
|
||
+import java.util.List;
|
||
+import java.util.Map;
|
||
import java.util.regex.Matcher;
|
||
import java.util.regex.Pattern;
|
||
|
||
diff --git a/src/main/java/net/minecraft/server/StatisticManager.java b/src/main/java/net/minecraft/server/StatisticManager.java
|
||
index e86e21b..418ec40 100644
|
||
--- a/src/main/java/net/minecraft/server/StatisticManager.java
|
||
+++ b/src/main/java/net/minecraft/server/StatisticManager.java
|
||
@@ -8,11 +8,10 @@ public class StatisticManager {
|
||
|
||
protected final Map a = Maps.newConcurrentMap();
|
||
|
||
- public StatisticManager() {
|
||
- }
|
||
+ public StatisticManager() {}
|
||
|
||
public boolean a(Achievement achievement) {
|
||
- return this.getStatisticValue((Statistic) achievement) > 0;
|
||
+ return this.getStatisticValue(achievement) > 0;
|
||
}
|
||
|
||
public boolean b(Achievement achievement) {
|
||
--
|
||
1.9.1
|
||
|