OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-15 12:02:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

revert change to make mobspawners drop a spawner of that type

Browse source 
removed some debug code
fixed a 1.5 compatibility issue
This commit is contained in:
Tahg 2011-09-29 15:36:02 -04:00
parent 935313dea7
commit b73d095a9f
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraft/server/BlockMobSpawner.java
View file

@ -17,7 +17,7 @@ public class BlockMobSpawner extends BlockContainer {
}
public int a(Random random) {
return 1; // CraftBukkit
return 0; // CraftBukkit
}
// CraftBukkit start

4
src/main/java/net/minecraft/server/EntityTypes.java
View file

@ -29,7 +29,7 @@ public class EntityTypes {
entity = (Entity) oclass.getConstructor(new Class[] { World.class}).newInstance(new Object[] { world});
}
} catch (Exception exception) {
exception.printStackTrace();
// CraftBukkit - don't do anything here
}
return entity;
@ -45,7 +45,7 @@ public class EntityTypes {
entity = (Entity) oclass.getConstructor(new Class[] { World.class}).newInstance(new Object[] { world});
}
} catch (Exception exception) {
exception.printStackTrace();
// CraftBukkit - don't do anything here
}
if (entity != null) {

7
src/main/java/net/minecraft/server/TileEntityMobSpawner.java
View file

@ -28,11 +28,10 @@ public class TileEntityMobSpawner extends TileEntity {
public void setId(int id) {
mobName = EntityTypes.getNameFromClass(EntityTypes.getClassFromId(id));
if(mobName == null || mobName.isEmpty()) mobName = "Pig";
try {
EntityTypes.a(mobName, world);
if (mobName == null || mobName.length() == 0) {
mobName = "Pig";
}
catch (Throwable t) { // If we get any error at all, fallback to a Pig
if (EntityTypes.a(mobName, world) == null) {
mobName = "Pig";
}
}