OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-08 11:24:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update CraftBukkit to 1.6.2

Browse source 
By: mbax <matt@phozop.net>
This commit is contained in:
CraftBukkit/Spigot 2013-07-08 19:43:37 -04:00
parent e05150ef39
commit 69a37fc533
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
paper-server/pom.xml
View file

@ -4,7 +4,7 @@
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1-R0.1-SNAPSHOT</version> <version>1.6.2-R0.1-SNAPSHOT</version>
<name>CraftBukkit</name> <name>CraftBukkit</name>
<url>http://www.bukkit.org</url> <url>http://www.bukkit.org</url>
@ -12,8 +12,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version> <api.version>unknown</api.version>
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
<minecraft.version>1.6.1</minecraft.version> <minecraft.version>1.6.2</minecraft.version>
<minecraft_version>1_6_R1</minecraft_version> <minecraft_version>1_6_R2</minecraft_version>
</properties> </properties>
<scm> <scm>

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View file

@ -90,7 +90,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setMaxHealth(double amount) { public void setMaxHealth(double amount) {
Validate.isTrue(amount > 0, "Max health must be greater than 0"); Validate.isTrue(amount > 0, "Max health must be greater than 0");
getHandle().a(GenericAttributes.a).a(amount); getHandle().getAttributeInstance(GenericAttributes.a).setValue(amount);
if (getHealth() > amount) { if (getHealth() > amount) {
setHealth(amount); setHealth(amount);

6
paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java
View file

@ -64,6 +64,12 @@ public class CraftPotionEffectType extends PotionEffectType {
return "POISON"; return "POISON";
case 20: case 20:
return "WITHER"; return "WITHER";
case 21:
return "HEALTH_BOOST";
case 22:
return "ABSORPTION";
case 23:
return "SATURATION";
default: default:
return "UNKNOWN_EFFECT_TYPE_" + handle.id; return "UNKNOWN_EFFECT_TYPE_" + handle.id;
} }